Merge pull request #194 from ageblade/master

fix(marker): Improve draggable marker support for static image

Author: juristr

src/directives/marker.js

@@ -109,8 +109,9 @@ angular.module('openlayers-directive').directive('olMarker', function($log, $q,
                         coord = coord.map(function(v) {
                             return parseInt(v, 10);
                         });
+                    } else {
+                        coord = ol.proj.transform(coord, proj, 'EPSG:4326');
                     }
-                    coord = ol.proj.transform(coord, proj, 'EPSG:4326');
 
                     if (evt.type === 'pointerdown') {
                         // Get feature under mouse if any
@@ -124,7 +125,11 @@ angular.module('openlayers-directive').directive('olMarker', function($log, $q,
                             return;
                         }
                         map.getTarget().style.cursor = 'pointer';
-                        pickOffset = [coord[0] - pickProperties.lon, coord[1] - pickProperties.lat];
+                        if (proj === 'pixel') {
+                            pickOffset = [coord[0] - pickProperties.coord[0], coord[1] - pickProperties.coord[1]];
+                        } else {
+                            pickOffset = [coord[0] - pickProperties.lon, coord[1] - pickProperties.lat];
+                        }
                         evt.preventDefault();
                     } else if (pickOffset && pickProperties) {
                         if (evt.type === 'pointerup') {
@@ -136,8 +141,13 @@ angular.module('openlayers-directive').directive('olMarker', function($log, $q,
                             evt.preventDefault();
                             scope.$apply(function() {
                                 // Add current delta to marker initial position
-                                pickProperties.lon = coord[0] - pickOffset[0];
-                                pickProperties.lat = coord[1] - pickOffset[1];
+                                if (proj === 'pixel') {
+                                    pickProperties.coord[0] = coord[0] - pickOffset[0];
+                                    pickProperties.coord[1] = coord[1] - pickOffset[1];
+                                } else {
+                                    pickProperties.lon = coord[0] - pickOffset[0];
+                                    pickProperties.lat = coord[1] - pickOffset[1];
+                                }
                             });
                         }
                     }
@@ -336,8 +346,13 @@ angular.module('openlayers-directive').directive('olMarker', function($log, $q,
                         marker.set('marker', properties);
                         markerLayer.getSource().addFeature(marker);
                     } else {
-                        var requestedPosition = ol.proj.transform([properties.lon, properties.lat], data.projection,
-                                                     map.getView().getProjection());
+                        var requestedPosition;
+                        if (properties.projection === 'pixel') {
+                            requestedPosition = properties.coord;
+                        } else {
+                            requestedPosition = ol.proj.transform([properties.lon, properties.lat], data.projection,
+                                map.getView().getProjection());
+                        }
 
                         if (!angular.equals(marker.getGeometry().getCoordinates(), requestedPosition)) {
                             var geometry = new ol.geom.Point(requestedPosition);