Merge pull request #187 from OnroerendErfgoed/develop

preparing release 1.3.2

MapController.js

@@ -110,6 +110,18 @@ define([
       return this.geoJsonFormatter.writeGeometry(geom);
     },
 
+    transformBoundingboxToMapExtent: function(boundingbox) {
+      var lowerleft = this.transformLatLonToPoint(boundingbox.lowerleft.lat, boundingbox.lowerleft.lon);
+      var upperright = this.transformLatLonToPoint(boundingbox.upperright.lat, boundingbox.upperright.lon);
+      return ([lowerleft.getCoordinates()[0], lowerleft.getCoordinates()[1],
+        upperright.getCoordinates()[0], upperright.getCoordinates()[1]]);
+    },
+
+    transformLatLonToPoint: function(lat, lon) {
+      var point = new ol.geom.Point([ lon, lat ]);
+      return (point.transform('EPSG:4326', 'EPSG:31370'));
+    },
+
     _createLayers: function(map) {
       /* base layers */
       var baseLayers = [];

ZoneMap.js

@@ -269,25 +269,27 @@ define([
         var crabNode = domConstruct.create("div");
         ZoomTab.addContent(crabNode);
         var crabZoomer = crabpyWidget.createCrabZoomer(crabNode);
+        crabZoomer.startup();
         var self = this;
 
         var zoomButton = domConstruct.create("a", {
           href: "#",
           title: "Zoom naar adres",
           'class': "button tiny expand",
           innerHTML: "Zoom naar adres",
-          onclick: function (evt) {
+          onclick: lang.hitch(this, function (evt) {
             evt.preventDefault();
-            var bbox = crabZoomer.getBbox();
-            if (bbox) {
-              self.mapController.zoomToExtent(bbox);
-              if (self.mapController.olMap.getView().getZoom() > 15) {
-                self.mapController.olMap.getView().setZoom(15);
+            var bboxobject = crabZoomer.getBbox();
+            if (bboxobject) {
+              var bbox = this.mapController.transformBoundingboxToMapExtent(bboxobject);
+              this.mapController.zoomToExtent(bbox);
+              if (this.mapController.olMap.getView().getZoom() > 15) {
+                this.mapController.olMap.getView().setZoom(15);
               }
               crabZoomer.reset();
               sidebar.collapse();
             }
-          }
+          })
         });
         ZoomTab.addContent(zoomButton);
 
@@ -313,7 +315,7 @@ define([
       }
 
       if (this.config.sidebar.draw) {
-        var drawTab = sidebar.createTab('Bepaal zone', 'fa-connectdevelop', 'Bepaal hier de zone.');
+        var drawTab = sidebar.createTab('Bepaal zone', 'fa-pencil', 'Bepaal hier de zone.');
 
         /* ZONE */
         var zonePane = domConstruct.create('div');

bower.json

@@ -14,7 +14,7 @@
     "dojo": "~1.12.1",
     "dijit": "~1.12.1",
     "proj4": "~2.3.15",
-    "crabpy_dojo": "https://github.com/OnroerendErfgoed/crabpy_dojo.git#0.2.0",
+    "crabpy_dojo": "https://github.com/OnroerendErfgoed/crabpy_dojo.git#1.4.3",
     "ol": "https://github.com/OnroerendErfgoed/ol3-amd.git#0.2.1",
     "font-awesome": "~4.6.3",
     "dgrid": "~1.1.0",

package.json

@@ -7,7 +7,7 @@
     "Widget",
     "Openlayers"
   ],
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/OnroerendErfgoed/zoneerder"