diff --git a/front/index.js b/front/index.js
index 7d33593..d61a895 100644
--- a/front/index.js
+++ b/front/index.js
@@ -1,54 +1,12 @@
-import 'ol/ol.css';
-import Map from 'ol/Map';
-import View from 'ol/View';
-import {getCenter} from 'ol/extent';
-import ImageLayer from 'ol/layer/Image';
-import Projection from 'ol/proj/Projection';
-import Static from 'ol/source/ImageStatic';
+import L from 'leaflet';
+import 'leaflet/dist/leaflet.css';
-import {Vector as VectorLayer} from 'ol/layer';
-import VectorSource from 'ol/source/Vector';
-
-import Feature from 'ol/Feature';
-import Point from 'ol/geom/Point';
-
-var testMarker = new Feature({
- type: 'icon',
- geometry: new Point([7000.0, 9000.0])
+var map = L.map('map', {
+ crs: L.CRS.Simple,
+ minZoom: -4
});
-var vectorLayer = new VectorLayer({
- source: new VectorSource({
- features: [testMarker]
- })
-})
+var bounds = [[0,0], [15360, 15360]];
+var image = L.imageOverlay('./maps/Tanoa.png', bounds).addTo(map);
-var extent = [0, 0, 15360, 15359];
-var projection = new Projection({
- code: 'xkcd-image',
- units: 'pixels',
- extent: extent
-});
-
-var map = new Map({
- layers: [
- new ImageLayer({
- source: new Static({
- attributions: '© xkcd',
- url: './maps/Tanoa.png',
- projection: projection,
- imageExtent: extent
- })
- }),
- vectorLayer
- ],
- target: 'map',
- view: new View({
- projection: projection,
- center: getCenter(extent),
- zoom: 2,
- maxZoom: 8
- })
-});
-
-// icon and text
+map.fitBounds(bounds);
diff --git a/front/package-lock.json b/front/package-lock.json
index 342f6e8..26d2387 100644
--- a/front/package-lock.json
+++ b/front/package-lock.json
@@ -1071,11 +1071,6 @@
"minimalistic-crypto-utils": "1.0.1"
}
},
- "elm-pep": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/elm-pep/-/elm-pep-1.0.4.tgz",
- "integrity": "sha512-Agx1VJzKKjRWL06yipX6m+Ew7WLiB73VWdkynsFc1CoA4gyY/o8wi9cMcy4B3A5DKwEEqJlr5FU2IsKOEwKG+g=="
- },
"emoji-regex": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -2186,7 +2181,8 @@
"ieee754": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
- "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+ "dev": true
},
"iferr": {
"version": "0.1.5",
@@ -2458,6 +2454,11 @@
"invert-kv": "2.0.0"
}
},
+ "leaflet": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.6.0.tgz",
+ "integrity": "sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ=="
+ },
"loader-runner": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -2597,6 +2598,12 @@
"brorand": "1.1.0"
}
},
+ "mime": {
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+ "dev": true
+ },
"mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -2853,17 +2860,6 @@
"isobject": "3.0.1"
}
},
- "ol": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ol/-/ol-6.2.1.tgz",
- "integrity": "sha512-CT2szew/COd7Zf9Bls+pdzewBYZNgyfxFivJ3L4Jv9Th7JdWjcQAT+pqMPH25L9SbVT+T17RCMq2H2m9uBCl1A==",
- "requires": {
- "elm-pep": "1.0.4",
- "pbf": "3.2.1",
- "pixelworks": "1.1.0",
- "rbush": "3.0.1"
- }
- },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3005,15 +3001,6 @@
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
"dev": true
},
- "pbf": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
- "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
- "requires": {
- "ieee754": "1.1.13",
- "resolve-protobuf-schema": "2.1.0"
- }
- },
"pbkdf2": {
"version": "3.0.17",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -3033,11 +3020,6 @@
"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
"dev": true
},
- "pixelworks": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/pixelworks/-/pixelworks-1.1.0.tgz",
- "integrity": "sha1-Hwla1I3Ki/ihyCWOAJIDGkTyLKU="
- },
"pkg-dir": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -3148,11 +3130,6 @@
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
"dev": true
},
- "protocol-buffers-schema": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz",
- "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA=="
- },
"prr": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -3224,11 +3201,6 @@
"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
"dev": true
},
- "quickselect": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
- "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
- },
"randombytes": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -3248,14 +3220,6 @@
"safe-buffer": "5.1.2"
}
},
- "rbush": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
- "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==",
- "requires": {
- "quickselect": "2.0.0"
- }
- },
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -3360,14 +3324,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true
},
- "resolve-protobuf-schema": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
- "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
- "requires": {
- "protocol-buffers-schema": "3.4.0"
- }
- },
"resolve-url": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -4062,6 +4018,29 @@
}
}
},
+ "url-loader": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-3.0.0.tgz",
+ "integrity": "sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A==",
+ "dev": true,
+ "requires": {
+ "loader-utils": "1.2.3",
+ "mime": "2.4.4",
+ "schema-utils": "2.6.4"
+ },
+ "dependencies": {
+ "schema-utils": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
+ "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+ "dev": true,
+ "requires": {
+ "ajv": "6.11.0",
+ "ajv-keywords": "3.4.1"
+ }
+ }
+ }
+ },
"use": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
diff --git a/front/package.json b/front/package.json
index 79cb8c2..dc0314e 100644
--- a/front/package.json
+++ b/front/package.json
@@ -11,10 +11,11 @@
"devDependencies": {
"css-loader": "^3.4.2",
"style-loader": "^1.1.3",
+ "url-loader": "^3.0.0",
"webpack": "^4.41.6",
"webpack-cli": "^3.3.11"
},
"dependencies": {
- "ol": "^6.2.1"
+ "leaflet": "^1.6.0"
}
}
diff --git a/front/webpack.config.js b/front/webpack.config.js
index 09b9587..1858a2a 100644
--- a/front/webpack.config.js
+++ b/front/webpack.config.js
@@ -8,10 +8,12 @@ module.exports = {
},
module: {
rules: [
+ { test: /\.css$/, loader: 'style-loader!css-loader' },
{
- test: /\.css$/i,
- use: ['style-loader', 'css-loader'],
- },
- ],
+ test: /\.png$/,
+ loader: 'url-loader',
+ query: { mimetype: 'image/png' }
+ }
+ ]
}
};
diff --git a/static/index.html b/static/index.html
index 2f8510a..0087902 100644
--- a/static/index.html
+++ b/static/index.html
@@ -4,7 +4,7 @@
leoservermod
-
+