Skip to content

Commit

Permalink
Merge pull request #45 from Patternslib/housekeeping
Browse files Browse the repository at this point in the history
Housekeeping
  • Loading branch information
thet authored Aug 27, 2024
2 parents 243510d + a157701 commit d568dbc
Show file tree
Hide file tree
Showing 4 changed files with 3,125 additions and 3,213 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
name: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
- run: |
make install
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
"license": "MIT",
"main": "./src/leaflet.js",
"dependencies": {
"@patternslib/patternslib": ">=9.8.2",
"@patternslib/patternslib": ">=9.9.16",
"fontawesome-free": "^1.0.4",
"jquery": "^3.6.4",
"leaflet": "^1.9.3",
"leaflet-geosearch": "^3.7.0",
"jquery": "^3.7.1",
"leaflet": "^1.9.4",
"leaflet-geosearch": "^4.0.0",
"leaflet-minimap": "^3.6.1",
"leaflet-providers": "^1.13.0",
"leaflet-providers": "^2.0.0",
"leaflet-sleep": "^0.5.2",
"leaflet.awesome-markers": "^2.0.5",
"leaflet.fullscreen": "^2.4.0",
"leaflet.locatecontrol": "^0.79.0",
"leaflet.fullscreen": "^3.0.2",
"leaflet.locatecontrol": "^0.81.1",
"leaflet.markercluster": "^1.5.3",
"leaflet.simplemarkers": "git+https://github.com/jdomingu/Leaflet.SimpleMarkers.git"
},
"devDependencies": {
"@patternslib/dev": "^3.1.12"
"@patternslib/dev": "^3.6.1"
},
"scripts": {
"start": "NODE_ENV=development webpack serve --config webpack.config.js",
Expand Down
3 changes: 1 addition & 2 deletions src/leaflet.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ parser.addArgument("map_layers", [
{ title: "Map", id: "OpenStreetMap.Mapnik", options: {} },
{ title: "Satellite", id: "Esri.WorldImagery", options: {} },
{ title: "Topographic", id: "OpenTopoMap", options: {} },
{ title: "Toner", id: "Stamen.Toner", options: {} },
]);

parser.addArgument("image_path", "node_modules/leaflet.awesome-markers/dist/images");
Expand All @@ -63,7 +62,7 @@ class Pattern extends BasePattern {
await import("leaflet.awesome-markers");
await import("leaflet.fullscreen");

const options = (this.options = parser.parse(this.el));
const options = this.options;

const fitBoundsOptions = (this.fitBoundsOptions = {
maxZoom: options.zoom,
Expand Down
Loading

0 comments on commit d568dbc

Please sign in to comment.