diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index e60ff59..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: [maplibre] -open_collective: maplibre diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 3da5e73..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve Maputnik -title: '' -labels: '' -assignees: '' - ---- - - - -**Maputnik version**: -**Browser**: -**OS**: - -**Description of the bug**: - -**Steps to reproduce the behavior**: -1. -2. -3. - -**Style file or style URL**: - - -**Screenshots**: - diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md deleted file mode 100644 index b104a7c..0000000 --- a/.github/ISSUE_TEMPLATE/other-issue.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: Other issue -about: Feature request or other issue which is no bug report -title: '' -labels: '' -assignees: '' - ---- - - - diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 2e98e0e..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "daily" - open-pull-requests-limit: 2 - versioning-strategy: increase - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - open-pull-requests-limit: 2 - versioning-strategy: increase diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4242b02..09b5618 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,28 +24,8 @@ jobs: run: npm run build - name: Upload to GitHub Pages - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: dist - - # publish docker to GitHub registry - deploy-docker: - name: deploy/docker - runs-on: ubuntu-latest - - if: ${{ github.event_name == 'push' }} - - strategy: - fail-fast: false - - steps: - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v4 - - run: docker build -t ghcr.io/maplibre/maputnik:main . - - run: docker push ghcr.io/maplibre/maputnik:main + cname: editor.geolonia.com diff --git a/package.json b/package.json index 412e085..accfbcc 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "main": "''", "scripts": { "start": "vite", - "build": "tsc && vite build --base=/maputnik/", + "build": "tsc && vite build --base=/", "lint": "eslint ./src ./cypress --ext ts,tsx,js,jsx --report-unused-disable-directives --max-warnings 0", "test": "cypress run", "cy:open": "cypress open", diff --git a/src/components/AppToolbar.tsx b/src/components/AppToolbar.tsx index ee1454c..d51ee55 100644 --- a/src/components/AppToolbar.tsx +++ b/src/components/AppToolbar.tsx @@ -194,12 +194,12 @@ export default class AppToolbar extends React.Component { className="maputnik-toolbar-logo" target="blank" rel="noreferrer noopener" - href="https://github.com/maplibre/maputnik" + href="https://github.com/geolonia/editor" > Maputnik on GitHub

{pkgJson.name} - v{pkgJson.version} + Geolonia v{pkgJson.version}

diff --git a/src/config/styles.json b/src/config/styles.json index b08f3f3..c5c4f16 100644 --- a/src/config/styles.json +++ b/src/config/styles.json @@ -1,4 +1,22 @@ [ + { + "id": "00-geolonia-basic-v1", + "title": "Geolonia Basic", + "url": "https://geoloniamaps.github.io/basic-v1/style.json", + "thumbnail": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAECAQAAAAHDYbIAAAAEUlEQVR42mP8/58BDhiJ4wAA974H/U5Xe1oAAAAASUVORK5CYII=" + }, + { + "id": "01-geolonia-gsi", + "title": "Geolonia GSI", + "url": "https://geoloniamaps.github.io/gsi/style.json", + "thumbnail": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAECAQAAAAHDYbIAAAAEUlEQVR42mP8/58BDhiJ4wAA974H/U5Xe1oAAAAASUVORK5CYII=" + }, + { + "id": "02-geolonia-smartcity-base", + "title": "Geolonia SmartCity Base", + "url": "https://smartcity-base.styles.geoloniamaps.com/style.json", + "thumbnail": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAECAQAAAAHDYbIAAAAEUlEQVR42mP8/58BDhiJ4wAA974H/U5Xe1oAAAAASUVORK5CYII=" + }, { "id": "0-empty-style", "title": "Empty Style",