Upgrade openlayers and bugfix (#143)

* upgrade openlayers and fix bug * fix openlayers version
thinkWhere · Oct 18, 2017 · 5c49e07 · 5c49e07
1 parent 596ee9f
commit 5c49e07
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/client/package.json b/client/package.json
@@ -14,29 +14,29 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.3.1",
-    "@angular/common": "^4.3.1",
-    "@angular/compiler": "^4.3.1",
-    "@angular/core": "^4.3.1",
-    "@angular/forms": "^4.3.1",
-    "@angular/http": "^4.3.1",
-    "@angular/platform-browser": "^4.3.1",
-    "@angular/platform-browser-dynamic": "^4.3.1",
-    "@angular/router": "^4.3.1",
-    "@swimlane/ngx-charts": "^6.0.1",
-    "@types/proj4": "^2.3.4",
-    "angular-pipes": "^6.5.2",
-    "bootstrap-sass": "^3.3.7",
-    "core-js": "^2.4.1",
-    "d3": "^4.10.0",
+    "@angular/animations": "4.3.1",
+    "@angular/common": "4.3.1",
+    "@angular/compiler": "4.3.1",
+    "@angular/core": "4.3.1",
+    "@angular/forms": "4.3.1",
+    "@angular/http": "4.3.1",
+    "@angular/platform-browser": "4.3.1",
+    "@angular/platform-browser-dynamic": "4.3.1",
+    "@angular/router": "4.3.1",
+    "@swimlane/ngx-charts": "6.0.1",
+    "@types/proj4": "2.3.4",
+    "angular-pipes": "6.5.2",
+    "bootstrap-sass": "3.3.7",
+    "core-js": "2.4.1",
+    "d3": "4.10.0",
     "enhanced-resolve": "3.3.0",
-    "font-awesome": "^4.7.0",
-    "jquery": "^3.2.1",
-    "jspdf": "^1.3.3",
-    "openlayers": "4.2.0",
-    "proj4": "^2.4.4",
-    "rxjs": "^5.1.0",
-    "zone.js": "^0.8.4"
+    "font-awesome": "4.7.0",
+    "jquery": "3.2.1",
+    "jspdf": "1.3.3",
+    "openlayers": "4.4.2",
+    "proj4": "2.4.4",
+    "rxjs": "5.1.0",
+    "zone.js": "0.8.4"
   },
   "devDependencies": {
     "@angular/cli": "1.2.4",

diff --git a/client/src/app/map/style.service.ts b/client/src/app/map/style.service.ts
@@ -68,7 +68,7 @@ export class StyleService {
                 text: new ol.style.Text({
                     text: ruleStyle.text.text,
                     font: ruleStyle.text.font,
-                    textBaseline: 'Bottom',
+                    textBaseline: 'bottom',
                     fill: new ol.style.Fill({
                         color: ruleStyle.text.fill.colour,
                     }),
@@ -200,7 +200,7 @@ export class StyleService {
                 else { // POINT
                     vectorContext.drawGeometry(
                         new ol.geom.Point(
-                            [13, 13 + i * heightPerCategory]
+                            [13, 15 + i * heightPerCategory]
                         ));
                 }