fix point symbolizer's dxdy

fuzhenn · web-flow · commit 2a2d9b042e6e · 2017-10-14T00:26:20.000+08:00
diff --git a/src/renderer/geometry/symbolizers/DrawAltitudeSymbolizer.js b/src/renderer/geometry/symbolizers/DrawAltitudeSymbolizer.js
@@ -1,4 +1,5 @@
 import { isObject } from 'core/util';
+import Point from 'geo/Point';
 import PointSymbolizer from './PointSymbolizer';
 import StrokeAndFillSymbolizer from './StrokeAndFillSymbolizer';
 import Canvas from 'core/Canvas';
@@ -32,6 +33,10 @@ export default class DrawAltitudeSymbolizer extends PointSymbolizer {
             // for get2DExtent
             this.style['lineWidth'] = 0;
         }
+        this.dxdy = this._defineStyle({
+            'dx' : symbol['textDx'] || symbol['markerDx'],
+            'dy' : symbol['textDy'] || symbol['markerDy']
+        });
     }
 
     symbolize(ctx) {
@@ -63,6 +68,11 @@ export default class DrawAltitudeSymbolizer extends PointSymbolizer {
         }
     }
 
+    getDxDy() {
+        const s = this.dxdy;
+        return new Point(s['dx'] || 0, s['dy'] || 0);
+    }
+
     get2DExtent() {
         if (this.geometry.type === 'LineString') {
             return StrokeAndFillSymbolizer.prototype.get2DExtent.apply(this);
diff --git a/src/renderer/geometry/symbolizers/ImageMarkerSymbolizer.js b/src/renderer/geometry/symbolizers/ImageMarkerSymbolizer.js
@@ -1,4 +1,5 @@
 import { isNil, isNumber, isArrayHasData, getValueOrDefault } from 'core/util';
+import Point from 'geo/Point';
 import PointExtent from 'geo/PointExtent';
 import Canvas from 'core/Canvas';
 import PointSymbolizer from './PointSymbolizer';
@@ -99,6 +100,13 @@ export default class ImageMarkerSymbolizer extends PointSymbolizer {
         return r * Math.PI / 180;
     }
 
+    getDxDy() {
+        const s = this.style;
+        const dx = s['markerDx'],
+            dy = s['markerDy'];
+        return new Point(dx, dy);
+    }
+
     getMarkerExtent(resources) {
         const url = this.style['markerFile'],
             img = resources ? resources.getImage(url) : null;
@@ -115,7 +123,10 @@ export default class ImageMarkerSymbolizer extends PointSymbolizer {
             'markerOpacity': getValueOrDefault(s['markerOpacity'], 1),
             'markerWidth': getValueOrDefault(s['markerWidth'], null),
             'markerHeight': getValueOrDefault(s['markerHeight'], null),
-            'markerRotation' : getValueOrDefault(s['markerRotation'], 0)
+            'markerRotation' : getValueOrDefault(s['markerRotation'], 0),
+
+            'markerDx': getValueOrDefault(s['markerDx'], 0),
+            'markerDy': getValueOrDefault(s['markerDy'], 0)
         };
     }
 }
diff --git a/src/renderer/geometry/symbolizers/PointSymbolizer.js b/src/renderer/geometry/symbolizers/PointSymbolizer.js
@@ -1,6 +1,5 @@
 import { computeDegree } from 'core/util';
 import PointExtent from 'geo/PointExtent';
-import Point from 'geo/Point';
 import CanvasSymbolizer from './CanvasSymbolizer';
 
 /**
@@ -20,10 +19,6 @@ class PointSymbolizer extends CanvasSymbolizer {
         this.symbol = symbol;
         this.geometry = geometry;
         this.painter = painter;
-        this.dxdy = this._defineStyle({
-            'dx' : symbol['textDx'] || symbol['markerDx'],
-            'dy' : symbol['textDy'] || symbol['markerDy']
-        });
     }
 
     get2DExtent() {
@@ -37,11 +32,6 @@ class PointSymbolizer extends CanvasSymbolizer {
         return extent;
     }
 
-    getDxDy() {
-        const s = this.dxdy;
-        return new Point(s['dx'] || 0, s['dy'] || 0);
-    }
-
     _getRenderPoints() {
         return this.getPainter().getRenderPoints(this.getPlacement());
     }
diff --git a/src/renderer/geometry/symbolizers/TextMarkerSymbolizer.js b/src/renderer/geometry/symbolizers/TextMarkerSymbolizer.js
@@ -5,6 +5,7 @@ import {
     isArrayHasData,
     getValueOrDefault
 } from 'core/util';
+import Point from 'geo/Point';
 import { hasFunctionDefinition } from 'core/mapbox';
 import { splitTextToRow, getAlignPoint, replaceVariable } from 'core/util/strings';
 import PointExtent from 'geo/PointExtent';
@@ -82,6 +83,11 @@ export default class TextMarkerSymbolizer extends PointSymbolizer {
         return r * Math.PI / 180;
     }
 
+    getDxDy() {
+        const s = this.style;
+        return new Point(s['textDx'], s['textDy']);
+    }
+
     getMarkerExtent() {
         const dxdy = this.getDxDy(),
             style = this.style;
@@ -119,6 +125,9 @@ export default class TextMarkerSymbolizer extends PointSymbolizer {
             'textWrapCharacter': getValueOrDefault(s['textWrapCharacter'], '\n'),
             'textLineSpacing': getValueOrDefault(s['textLineSpacing'], 0),
 
+            'textDx': getValueOrDefault(s['textDx'], 0),
+            'textDy': getValueOrDefault(s['textDy'], 0),
+
             'textHorizontalAlignment': getValueOrDefault(s['textHorizontalAlignment'], 'middle'), //left | middle | right | auto
             'textVerticalAlignment': getValueOrDefault(s['textVerticalAlignment'], 'middle'), // top | middle | bottom | auto
             'textAlign': getValueOrDefault(s['textAlign'], 'center'), //left | right | center | auto
diff --git a/src/renderer/geometry/symbolizers/VectorMarkerSymbolizer.js b/src/renderer/geometry/symbolizers/VectorMarkerSymbolizer.js
@@ -53,6 +53,13 @@ export default class VectorMarkerSymbolizer extends PointSymbolizer {
 
     }
 
+    getDxDy() {
+        const s = this.style;
+        const dx = s['markerDx'],
+            dy = s['markerDy'];
+        return new Point(dx, dy);
+    }
+
     _drawMarkers(ctx, cookedPoints, resources) {
 
         const strokeAndFill = this.strokeAndFill;
@@ -274,6 +281,9 @@ export default class VectorMarkerSymbolizer extends PointSymbolizer {
             'markerLineDasharray': getValueOrDefault(s['markerLineDasharray'], []),
             'markerLinePatternFile': getValueOrDefault(s['markerLinePatternFile'], null),
 
+            'markerDx': getValueOrDefault(s['markerDx'], 0),
+            'markerDy': getValueOrDefault(s['markerDy'], 0),
+
             'markerWidth': getValueOrDefault(s['markerWidth'], 10),
             'markerHeight': getValueOrDefault(s['markerHeight'], 10),
 
diff --git a/test/geometry/symbol/SymbolSpec.js b/test/geometry/symbol/SymbolSpec.js
@@ -139,8 +139,8 @@ describe('SymbolSpec', function () {
             expect(symbolizer.style.markerFillOpacity).to.be.eql(0.5);
             expect(symbolizer.style.markerLineWidth).to.be.eql(2);
             expect(symbolizer.style.markerLineOpacity).to.be.eql(0.6);
-            expect(symbolizer.dxdy.dx).to.be.eql(1);
-            expect(symbolizer.dxdy.dy).to.be.eql(2);
+            expect(symbolizer.style.markerDx).to.be.eql(1);
+            expect(symbolizer.style.markerDy).to.be.eql(2);
         });
 
         it('image marker symbolizer', function () {
@@ -156,8 +156,8 @@ describe('SymbolSpec', function () {
             expect(symbolizer.style.markerWidth).to.be.eql(20);
             expect(symbolizer.style.markerHeight).to.be.eql(30);
             expect(symbolizer.style.markerOpacity).to.be.eql(0.5);
-            expect(symbolizer.dxdy.dx).to.be.eql(1);
-            expect(symbolizer.dxdy.dy).to.be.eql(2);
+            expect(symbolizer.style.markerDx).to.be.eql(1);
+            expect(symbolizer.style.markerDy).to.be.eql(2);
         });
 
         it('text marker symbolizer', function () {
@@ -178,8 +178,8 @@ describe('SymbolSpec', function () {
             expect(symbolizer.style.textHaloRadius).to.be.eql(4);
             expect(symbolizer.style.textWrapWidth).to.be.eql(3);
             expect(symbolizer.style.textLineSpacing).to.be.eql(2);
-            expect(symbolizer.dxdy.dx).to.be.eql(1);
-            expect(symbolizer.dxdy.dy).to.be.eql(2);
+            expect(symbolizer.style.textDx).to.be.eql(1);
+            expect(symbolizer.style.textDy).to.be.eql(2);
         });
     });
 
