Commit d6778e03 authored by elplauto's avatar elplauto
Browse files

merge

parents 29ef60f9 09cf9c76
public/favicon.ico

4.19 KB | W: | H:

public/favicon.ico

12.8 KB | W: | H:

public/favicon.ico
public/favicon.ico
public/favicon.ico
public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
......@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>osm-webpack</title>
<title>Albiziapp</title>
</head>
<body>
<noscript>
......
{
"name": "osm-webpack",
"short_name": "osm-webpack",
"name": "Albiziapp",
"short_name": "Albiziapp",
"icons": [
{
"src": "./img/icons/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "./img/icons/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
"src": "./favicon.ico",
"sizes": "100x104",
"type": "image/ico"
}
],
"start_url": "./index.html",
......
This diff is collapsed.
......@@ -89,6 +89,7 @@ export default {
allowOSMModif:"Allow OSM modification",
restoreMission: "Restore mission",
restore: "Restore",
showOSMData: "Show OSM data",
//ARBORETUM
......@@ -240,6 +241,7 @@ export default {
allowOSMModif:"Autoriser modification d'OSM",
restoreMission: "Restaurer mission",
restore: "Restaurer",
showOSMData: "Montrer données OSM",
//ARBORETUM
......
......@@ -11,7 +11,14 @@
</div>
</v-ons-list-item>
<v-ons-list-item>
<div class="center">{{ $t('allowOSMModif')}}</div>
<div class="center">{{ $t('showOSMData') }}</div>
<div class="right">
<v-ons-switch v-model="showOSM"></v-ons-switch>
</div>
</v-ons-list-item>
<v-ons-list-item>
<div class="center">{{ $t('allowOSMModif') }}</div>
<div class="right">
<v-ons-switch v-model="identCheck" @change="osmUpdates"></v-ons-switch>
</div>
......@@ -186,6 +193,16 @@ export default {
this.$store.commit("commonData/setIdentificationMode", val);
}
},
showOSM:{
get(){
return this.$store.state.commonData.showOSM;
},
set(val){
this.$store.commit("commonData/showOSM", val);
}
},
osmUpdates: {
get() {
return this.$store.state.commonData.osmUpdates;
......
......@@ -97,10 +97,6 @@
<l-tile-layer :url="url" :options="mapOptions" :attribution="attribution"/>
</l-map>
<v-ons-card>
<v-ons-button @click="centerMap">Centrer carte</v-ons-button>
</v-ons-card>
<v-ons-alert-dialog modifier="rowfooter" :visible.sync="missionOver">
<span slot="title">{{ $t('missionOverTitle') }}</span>
{{ $t('missionOverDesc') }}
......@@ -261,6 +257,10 @@ export default {
.short;
}
},
showOSM(){
return this.$store.state.commonData.showOSM
}
,
missionDone() {
if (this.$store.state.user.activite) {
return false;
......@@ -322,9 +322,6 @@ export default {
.filter(value => !extractContributor(value).includes(this.userID));
return [];
},
tempMarker() {
return this.$store.state.osmData.tempMarker;
},
observationsOtherDone() {
if (this.verification)
return this.$store.state.releve.releves
......@@ -333,10 +330,9 @@ export default {
.filter(value => extractContributor(value).includes(this.userID));
return [];
},
tempSuppressed() {
return this.$store.state.osmData.tempSuppressed;
},
osmData() {
if(!this.showOSM)
return []
let importedObs = this.observationsFromOSM.map(val => val.nodeId);
return this.$store.state.osmData.data
.filter(val => !importedObs.includes(val.id.replace('node/','')))
......@@ -571,7 +567,7 @@ export default {
this.currentZoom = zoom;
},
centerUpdate(center) {
if(this.showOSM)
this.$store.dispatch("osmData/getOSMData", {
boundary: this.map.getBounds()
});
......
......@@ -31,11 +31,11 @@
<b>modifier</b> le relevé
<b>ou bien confirmer que les informations sont correctes</b>
</p>
<v-ons-button @click="modify" :disabled="noTreeValue" style="margin: 6px 0">Modifier</v-ons-button>
<v-ons-button :disabled="validated || noTreeValue" @click="validate" style="margin: 6px 0">Confirmer</v-ons-button>
<v-ons-button v-if="allowImport && !fromOSM && osmUpdates" @click="uploadToOSM" style="margin: 6px 0">Envoyer vers OSM</v-ons-button>
<v-ons-button @click="modify" :disabled="noTreeValue" style="margin: 6px">Modifier</v-ons-button>
<v-ons-button :disabled="validated || noTreeValue" @click="validate" style="margin: 6px">Confirmer</v-ons-button>
<v-ons-button v-if="allowImport && !fromOSM && osmUpdates" @click="uploadToOSM" style="margin: 6px">Envoyer vers OSM</v-ons-button>
<v-ons-button v-if="visualize" @click="visualizeReleve" style="margin: 6px 0">Voir</v-ons-button>
<v-ons-button v-if="visualize" @click="visualizeReleve" style="margin: 6px">Voir</v-ons-button>
</section>
<section style="margin: 16px">
<p class="center">
......@@ -50,11 +50,11 @@
</section>
<section v-if="!fromOSM" style="margin: 16px">
<p class="center">Supprimer le relevé, cette opération est définitive!</p>
<v-ons-button @click="removeObs" :disabled="(!allowRemove)" style="margin: 6px 0">Supprimer</v-ons-button>
<v-ons-button @click="removeObs" :disabled="(!allowRemove)" style="margin: 6px">Supprimer</v-ons-button>
</section>
<section v-if="fromOSM && osmUpdates" style="margin: 16px">
<p class="center">Renvoyer le relevé sur OSM</p>
<v-ons-button @click="uploadAndRemove" style="margin: 6px 0">Renvoyer vers OSM</v-ons-button>
<v-ons-button @click="uploadAndRemove" style="margin: 6px">Renvoyer vers OSM</v-ons-button>
</section>
<section v-if="releve.prev.length>0" style="margin: 16px">
......@@ -90,6 +90,12 @@
</ons-card>
</v-ons-page>
</template>
<style>
.card--material__content{
color:black;
}
</style>
<script>
import SimplePage from "./SimplePage.vue";
import uploadObservationToOSM from "../js/osmPost"
......
......@@ -110,13 +110,13 @@
<v-ons-button
@click="complete"
:disabled="releve.identificationValue.success || !hasImage"
style="margin: 6px 0"
style="margin: 6px"
>{{ $t('validate') }}</v-ons-button>
<v-ons-button modifier="outline" @click="cancel" style="margin: 6px 0">{{ $t('back') }}</v-ons-button>
<v-ons-button modifier="outline" @click="cancel" style="margin: 6px">{{ $t('back') }}</v-ons-button>
</section>
<section style="margin: 16px" v-if="isGod">
<p class="center">Supprimer l'exercice d'identification</p>
<v-ons-button @click="removeObs" style="margin: 6px 0">Supprimer</v-ons-button>
<v-ons-button @click="removeObs" style="margin: 6px">Supprimer</v-ons-button>
</section>
</v-ons-page>
</template>
......
......@@ -18,8 +18,8 @@
<img v-show="releve.image" :src="releve.image" style="width: 100%">
<section style="margin: 16px">
<v-ons-button :disabled="importDone" @click="importObservation" style="margin: 6px 0">{{ $t('importAlbiziapp') }}</v-ons-button>
<v-ons-button v-if="osmUpdates" @click="remove" style="margin: 6px 0">{{ $t('deleteOSMTree') }}</v-ons-button>
<v-ons-button :disabled="importDone" @click="importObservation" style="margin: 6px">{{ $t('importAlbiziapp') }}</v-ons-button>
<v-ons-button v-if="osmUpdates" @click="remove" style="margin: 6px">{{ $t('deleteOSMTree') }}</v-ons-button>
</section>
</div>
</ons-card>
......
......@@ -110,9 +110,9 @@
</v-ons-list-item>
</v-ons-list>
<section style="margin: 16px">
<v-ons-button v-if="!modify && osmUpdates" @click="uploadToOSM" style="margin: 6px 0">{{ $t('sendOSM') }}</v-ons-button>
<v-ons-button @click="complete" style="margin: 6px 0">{{ $t('save') }}</v-ons-button>
<v-ons-button modifier="outline" @click="cancel" style="margin: 6px 0">{{ $t('cancel') }}</v-ons-button>
<v-ons-button v-if="!modify && osmUpdates" @click="uploadToOSM" style="margin: 6px">{{ $t('sendOSM') }}</v-ons-button>
<v-ons-button @click="complete" style="margin: 6px">{{ $t('save') }}</v-ons-button>
<v-ons-button modifier="outline" @click="cancel" style="margin: 6px">{{ $t('cancel') }}</v-ons-button>
</section>
</v-ons-page>
</template>
......
......@@ -15,6 +15,7 @@ export default {
identification: false,
verification: false,
osmUpdates:false,
showOSM:false,
confidenceValues: [
'Non renseignée',
'Peu confiant',
......@@ -25,6 +26,9 @@ export default {
setVerificationMode(state, mode) {
state.verification = mode
},
showOSM(state,mode){
state.showOSM=mode
},
setOsmUpdates(state, mode) {
state.osmUpdates = mode
},
......@@ -39,8 +43,6 @@ export default {
namespaced: true,
state: {
data: [],
tempMarker:[],
tempSuppressed:[],
},
mutations: {
setData(state, data) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment