Skip to content

Commit 1758f0c

Browse files
Merge pull request #159 from OS2iot/feature/1508_HeightsMap
Feature/1508 heights map
2 parents 9c12672 + 9de113a commit 1758f0c

File tree

12 files changed

+1867
-1456
lines changed

12 files changed

+1867
-1456
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ testem.log
4545
# System Files
4646
.DS_Store
4747
Thumbs.db
48+
49+
src/assets/env.js

package-lock.json

Lines changed: 99 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@ngx-translate/core": "^13.0.0",
3333
"@ngx-translate/http-loader": "^6.0.0",
3434
"@popperjs/core": "^2.11.6",
35-
"@types/leaflet.markercluster": "1.5.3",
3635
"all": "0.0.0",
3736
"animate.css": "^4.1.1",
3837
"bootstrap": "5.0.0-alpha2",
@@ -43,7 +42,6 @@
4342
"leaflet": "^1.9.4",
4443
"leaflet-geosearch": "3.6.1",
4544
"leaflet.fullscreen": "^3.0.1",
46-
4745
"moment": "^2.29.4",
4846
"monaco-editor": "^0.33.0",
4947
"ng": "0.0.0",
@@ -52,6 +50,7 @@
5250
"ngx-monaco-editor-v2": "^14.0.4",
5351
"ngx-papaparse": "^5.0.0",
5452
"popper.js": "^1.16.1",
53+
"proj4leaflet": "^1.0.2",
5554
"rxjs": "~6.6.7",
5655
"tslib": "^2.0.0",
5756
"tslint": "~6.1.0",
@@ -68,7 +67,8 @@
6867
"@types/jwt-decode": "^3.1.0",
6968
"@types/leaflet": "^1.9.8",
7069
"@types/leaflet.fullscreen": "^3.0.2",
71-
"leaflet.markercluster": "1.5.3",
70+
"@types/leaflet.markercluster": "1.5.3",
71+
"@types/proj4leaflet": "^1.0.10",
7272
"@types/node": "^12.11.1",
7373
"codelyzer": "^6.0.2",
7474
"eslint": "^7.3.1",
@@ -79,6 +79,7 @@
7979
"karma-coverage-istanbul-reporter": "~3.0.2",
8080
"karma-jasmine": "~4.0.0",
8181
"karma-jasmine-html-reporter": "^1.5.0",
82+
"leaflet.markercluster": "1.5.3",
8283
"ngrx-store-freeze": "^0.2.4",
8384
"prettier": "^2.0.5",
8485
"protractor": "~7.0.0",

0 commit comments

Comments
 (0)