@cowegis/client 1.0.2 → 1.0.4

package/js/factory/MapFactory.js

@@ -40,7 +40,7 @@ class MapFactory {
 
         this.registerListeners(config, element);
 
-        if (config.view) {
+        if (config.view && config.view.center) {
             element.map.setView(config.view.center, config.view.zoom, config.view.zoomOptions);
         }
 

package/js/layer/OverpassLayer.js

@@ -1,6 +1,9 @@
 import osmtogeojson from 'osmtogeojson';
 
 import leaflet from '../leaflet';
+import {mapFactory} from "../factory";
+import {determineListener} from "../factory/bindEvents";
+import pointToLayer from "../geojson/pointToLayer";
 
 /**
  * Get the bounds as overpass bbox string.
@@ -30,19 +33,21 @@ export default leaflet.FeatureGroup.extend({
      *
      * @param options
      */
-    initialize: function (options) {
-        if (!options.pointToLayer) {
-            options.pointToLayer = this.pointToLayer;
-        }
-        if (!options.onEachFeature) {
-            options.onEachFeature = this.onEachFeature;
-        }
+    initialize: function (options, element) {
+        options.pointToLayer = options.pointToLayer
+            ? determineListener(options.pointToLayer, element)
+            : this.pointToLayer;
+
+        options.onEachFeature = options.onEachFeature
+            ? determineListener(options.onEachFeature, element)
+            : this.onEachFeature;
 
         leaflet.Util.setOptions(this, options);
-        this.options.dynamicLoad = !!this.options.query.match(/BBOX/g);
+        this.options.dynamicLoad = !this.options.adjustBounds && !!this.options.query.match(/BBOX/g);
 
         this._layer  = leaflet.geoJson();
         this._layers = {};
+        this._element = element;
 
         this.addLayer(this._layer);
     },
@@ -58,7 +63,7 @@ export default leaflet.FeatureGroup.extend({
 
         var bounds = toOverpassBBoxString(this._map.getBounds());
         var query  = this.options.query.replace(/(BBOX)/g, bounds);
-        var url    = this.options.endpoint + 'interpreter?data=[out:json];' + query;
+        var url    = this.options.endpoint + 'interpreter?data=' + encodeURIComponent('[out:json];' + query);
 
         this._map.fire('dataloading', {layer: this});
 
@@ -74,11 +79,9 @@ export default leaflet.FeatureGroup.extend({
             this.removeLayer(this._layer);
             this._layer = layer;
 
-            if (this.options.boundsMode === 'extend' && layer.getBounds().isValid()) {
+            if (this.options.adjustBounds && layer.getBounds().isValid()) {
                 var bounds = this._map.getBounds();
-                bounds     = bounds.extend(layer.getBounds());
-
-                this._map.fitBounds(bounds, this._map.getBoundsOptions());
+                this._map.fitBounds(bounds.extend(layer.getBounds()));
             }
 
             this._map.fire('dataload', {layer: this});
@@ -88,8 +91,9 @@ export default leaflet.FeatureGroup.extend({
      * @param map
      */
     onAdd: function (map) {
-        // TODO: Make it configurable
-        map.on('moveend', this.refreshData, this);
+        if (this.options.dynamicLoad) {
+            map.on('moveend', this.refreshData, this);
+        }
 
         this.refreshData();
     },
@@ -103,20 +107,18 @@ export default leaflet.FeatureGroup.extend({
                 marker.setRadius(feature.properties.radius);
             }
 
-            // TODO: Icon handling
             if (feature.properties.icon) {
-                icon = this._map.getIcon(feature.properties.icon);
-
-            } else if (feature.properties.tags
-                && feature.properties.tags.amenity
-                && this.options.amenityIcons[feature.properties.tags.amenity]
-            ) {
-                //icon = L.contao.getIcon(this.options.amenityIcons[feature.properties.tags.amenity]);
+                icon = feature.properties.icon;
+            } else if (feature.properties.amenity) {
+                icon = this.options.amenityIcons[feature.properties.amenity] || undefined;
             }
 
-            // TODO: Icon handling
-            if (icon) {
-                marker.setIcon(icon);
+            if (icon && this._element.config.map.presets.icons[icon]) {
+                mapFactory.createIcon(
+                    this._element.config.map.presets.icons[icon],
+                    feature.properties,
+                    this._element
+                ).then(icon => marker.setIcon(icon));
             }
         }
 

package/js/layer/dataLayerFactory.js

@@ -83,6 +83,10 @@ export default async function (config, element) {
         ? determineListener(config.options.pointToLayer, element)
         : pointToLayer;
 
+    if (config.options.onEachFeature) {
+        config.options.onEachFeature = determineListener(config.options.onEachFeature, element);
+    }
+
     config.options.pointToLayer = (feature, latlng) => pointToLayerCallback(feature, latlng, element, pointToLayer);
 
     const layer = leaflet.geoJSON(data, config.options);

package/js/layer/overpassLayerFactory.js

@@ -1,5 +1,5 @@
 import OverpassLayer from './OverpassLayer';
 
 export default async function (config, element) {
-    return new OverpassLayer(config.options);
+    return new OverpassLayer(config.options, element);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cowegis/client",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Cowegis web client",
   "main": "js/client.js",
   "repository": {