diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue deleted file mode 100644 index dc55020..0000000 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue index db4ab64..260c3ed 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue @@ -64,9 +64,9 @@
- -
@@ -110,39 +110,6 @@ geometryTypeToCmpName(type) { return 'vl-geom-' + kebabCase(type) }, - /** - * Packman layer Style function factory - * @return {ol.StyleFunction} - */ - pacmanStyleFunc() { - const pacman = [ - createStyle({ - strokeColor: '#de9147', - strokeWidth: 3, - fillColor: [222, 189, 36, 0.8], - }), - ] - const path = [ - createStyle({ - strokeColor: 'blue', - strokeWidth: 1, - }), - createStyle({ - imageRadius: 5, - imageFillColor: 'orange', - geom(feature) { - // geometry is an LineString, convert it to MultiPoint to style vertex - return createMultiPointGeom(feature.getGeometry().getCoordinates()) - }, - }), - ] - const eye = [ - createStyle({ - imageRadius: 6, - imageFillColor: '#444444', - }), - ] - }, /** * Cluster layer style function factory * @return {ol.StyleFunction} @@ -248,6 +215,13 @@ setCenter(position) { this.center = position; this.$emit('updatecoords', this.center); + }, + setCoordInput(val) { + this.inputCenter0 = val[0]; + this.inputCenter1 = val[1]; + }, + updateCenterValues() { + this.setCenter([this.inputCenter0, this.inputCenter1]) } } @@ -262,7 +236,9 @@ }, data() { return { - center: [9.208858198755664, 49.14785422283188], + inputCenter0: 9.208858198755664, + inputCenter1: 49.14785422283188, + //center: [9.208858198755664, 49.14785422283188], zoom: 15, rotation: 0, clickCoordinate: undefined, @@ -327,9 +303,36 @@ this.center = val; this.$emit('updatecoords', this.center); } - - } - }, + }, + // center0: { + // get() { + // console.log("center0 get") + // + // return this.center[0]; + // }, + // set(val) { + // console.log("center0 set") + // let center1 = this.center[1]; + // let center0 = val; + // this.center = [center0, center1]; + // console.log(this.center) + // } + // }, + center: { + get() { + console.log("center get"); + console.log("center get"); + return [this.inputCenter0, this.inputCenter1]; + }, + set(val) { + console.log("center set"); + this.inputCenter0 = val[0]; + this.inputCenter1 = val[1]; + console.log(this.inputCenter0) + console.log(this.inputCenter1) + } + }, + } } diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue index c627de1..d0ac870 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue @@ -97,8 +97,8 @@ }, methods: { validateEmail(email) { - //var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; - let re = new RegExp('/^(([^<>()\\[\\]\\\\.,;:\\s@"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@"]+)*)|(".+"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/'); + var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + // let re = new RegExp('/^(([^<>()\\[\\]\\\\.,;:\\s@"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@"]+)*)|(".+"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$/'); return re.test(String(email).toLowerCase()); }, register: function () { diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationEdit.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationEdit.vue index 51e0e0e..c797474 100644 --- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationEdit.vue +++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationEdit.vue @@ -3,7 +3,7 @@

{{ isEndstation ? "Endstation bearbeiten" : isNewStation ? "Neue Station" : "Station bearbeiten"}}

-