Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds the leaflet.markercluster package #7

Merged
merged 1 commit into from
Apr 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/amaps.es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/amaps.iife.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/amaps.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/multiselect.es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/multiselect.iife.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/multiselect.js

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions dist/nlmaps/dist/assets/css/nlmaps.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nlmaps-hidden {
display: none;
display:none;
}

/*** Geolocator control ***/
Expand All @@ -10,12 +10,12 @@
height: 26px;
width: 26px;
border-radius: 26px 26px;
right: ".5em";
top: ".5em";
right: '.5em';
top: '.5em';
}

.nlmaps-geolocator-control img {
background-image: url("../img/geolocator_icon.svg");
background-image: url('./assets/img/geolocator_icon.svg');
display: block;
box-sizing: border-box;
width: 26px;
Expand All @@ -24,6 +24,7 @@
}
/*myControlEl.className = 'ol-control';*/


/*** Geocoder control ***/
.nlmaps-geocoder-control-container {
width: 326px;
Expand All @@ -37,7 +38,7 @@
flex-flow: row;
}

.nlmaps-geocoder-control-container input[type="text"] {
.nlmaps-geocoder-control-container input[type="text"]{
flex-grow: 1;
padding: 4px 10px;

Expand All @@ -52,7 +53,7 @@
width: 34px;
border: none;
background-color: rgb(255, 255, 255);
background-image: url("../img/search_icon.svg");
background-image: url('../img/search_icon.svg');
box-shadow: rgba(0, 0, 0, 0.65) 0px 1px 5px;
height: 34px;
border-radius: 0px 5px 5px 0px;
Expand All @@ -68,9 +69,10 @@
color: #fff;
}


.nlmaps-geocoder-result-list {
padding: 10px 10px 2px 10px;
width: 300px;
width:300px;
background-color: #fff;
border-radius: 5px 5px;
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.65);
Expand All @@ -93,5 +95,5 @@
}

.leaflet-grab.nlmaps-marker-cursor {
cursor: pointer;
cursor: pointer
}
2 changes: 1 addition & 1 deletion dist/pointquery.es.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/pointquery.iife.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/pointquery.js

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@datapunt/amsterdam-amaps",
"version": "3.0.2",
"version": "3.1.0",
"description": "implementation of nlmaps for Amsterdam",
"main": "dist/amaps.js",
"browser": "dist/amaps.iife.js",
Expand Down Expand Up @@ -40,6 +40,8 @@
"eslint-plugin-standard": "^3.1.0",
"esm": "3.0.63",
"http-server": "^0.11.1",
"leaflet": "^1.6.0",
"leaflet.markercluster": "^1.4.1",
"live-server": "^1.2.1",
"live-server-https": "0.0.2",
"node-fetch": "^2.1.2",
Expand All @@ -59,6 +61,10 @@
"tape": "^4.9.1",
"tape-catch": "^1.0.6"
},
"peerDependencies": {
"leaflet": "^1.6.0",
"leaflet.markercluster": "^1.4.1"
},
"scripts": {
"dev": "npm-run-all --parallel serve watch-browser-test watch-unit-test watch-build-amaps watch-nlmaps",
"test": "npm-run-all browser-test unit-test",
Expand All @@ -69,6 +75,7 @@
"serve": "node scripts/devserver.js",
"lint": "eslint test scripts src",
"build-amaps": "node scripts/build-amaps.js",
"build": "node scripts/build-amaps.js --production",
"watch-build-amaps": "NODE_ENV=development node scripts/build-amaps.js -w",
"get-nlmaps": "shx rm -rf nlmaps && git clone --depth=1 --branch v$npm_package_nlmaps_version https://github.com/webmapper/nlmaps",
"install-nlmaps": "node scripts/install-nlmaps.js",
Expand All @@ -90,4 +97,4 @@
"publishConfig": {
"access": "public"
}
}
}
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*amaps is just nlmaps built with Amsterdam's config. So let's rename it amaps.*/
import { nlmaps } from '../nlmaps/packages/nlmaps/src/index.js';
import 'leaflet.markercluster';
const amaps = nlmaps;
export default amaps;
1 change: 1 addition & 0 deletions src/multiselect.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'whatwg-fetch';
import tress from 'tress';
import { nlmaps } from '../nlmaps/dist/nlmaps.es.js';
import { pointQueryChain } from './lib.js';
import 'leaflet.markercluster';
import emitonoff from 'emitonoff';
/* eslint-disable-next-line max-len */
const URL = 'https://map.data.amsterdam.nl/maps/parkeervakken?REQUEST=GetFeature&SERVICE=wfs&OUTPUTFORMAT=application/json;%20subtype=geojson;%20charset=utf-8&Typename=fiscaal_parkeervakken&version=1.1.0&srsname=urn:ogc:def:crs:EPSG::4326';
Expand Down
9 changes: 5 additions & 4 deletions src/pointquery.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import "whatwg-fetch";
import { nlmaps } from "../nlmaps/dist/nlmaps.es.js";
import { pointQueryChain } from "./lib.js";
import emitonoff from "emitonoff";
import 'whatwg-fetch';
import { nlmaps } from '../nlmaps/dist/nlmaps.es.js';
import { pointQueryChain } from './lib.js';
import 'leaflet.markercluster';
import emitonoff from 'emitonoff';
const mora = {};
emitonoff(mora);

Expand Down