Compare commits

...

1684 Commits

Author SHA1 Message Date
HarelM f971a00d0b deploy: 00b20af1d9 2026-05-17 07:27:09 +00:00
HarelM 2b5f5da7be deploy: 47a42b3e2f 2026-05-17 07:20:02 +00:00
HarelM 75a046e3d0 deploy: 3d061882f3 2026-05-12 12:55:43 +00:00
HarelM ac8a3ee050 deploy: 58c84f510b 2026-05-06 14:13:14 +00:00
HarelM 8e1a419909 deploy: 93596b3540 2026-05-06 14:12:36 +00:00
HarelM 2c71412e49 deploy: a62e5014ee 2026-04-02 10:56:24 +00:00
HarelM bc7f27d15a deploy: cb9b7beb32 2026-03-03 12:15:46 +00:00
HarelM b3812fa927 deploy: 738ce853ae 2026-03-03 11:24:19 +00:00
HarelM b6f569ad96 deploy: 4157d2ee08 2026-03-03 10:36:54 +00:00
HarelM 9ebd6d84d9 deploy: c629e10af7 2026-01-21 21:05:36 +00:00
HarelM 6010c6810a deploy: f24031dd5c 2026-01-20 05:46:30 +00:00
HarelM 7943252400 deploy: c3a35354f7 2025-12-17 08:28:29 +00:00
HarelM 72b9e624a7 deploy: c168e65d86 2025-12-03 11:40:13 +00:00
HarelM 4c847faaae deploy: 74a21e1b77 2025-12-02 10:04:09 +00:00
HarelM 7089ca1b5c deploy: 9d19ab8606 2025-12-02 09:34:09 +00:00
HarelM 2cd6019cb2 deploy: 522815b4c5 2025-11-20 10:56:01 +00:00
HarelM 775b5f4a39 deploy: 7a93d592ff 2025-11-09 21:58:08 +00:00
HarelM 93baf3d5e2 deploy: 876a3d70df 2025-11-09 11:03:19 +00:00
HarelM 74f44a49af deploy: 0fbba4b362 2025-11-06 14:32:20 +00:00
HarelM 6310d6f11e deploy: 4ba09144e9 2025-11-06 12:19:37 +00:00
HarelM 8153050d38 deploy: 5b34a3791f 2025-11-04 07:12:13 +00:00
HarelM 917da6bc7d deploy: 696e43b474 2025-11-02 13:38:53 +00:00
HarelM 5f0ea7be24 deploy: fe2571addb 2025-10-17 23:43:49 +00:00
HarelM 8db5842e85 deploy: 7e784f80f6 2025-10-17 20:17:50 +00:00
HarelM 5a8effb363 deploy: 8cd5e28f3a 2025-10-10 13:41:06 +00:00
HarelM 236058e95b deploy: 39d63ec7b1 2025-10-05 13:39:07 +00:00
HarelM 2da67c7963 deploy: 1730e9cb1c 2025-09-17 17:52:33 +00:00
HarelM f67704c545 deploy: 3c3fcadbb6 2025-09-16 13:43:10 +00:00
HarelM 83b96e8f80 deploy: b42afd0027 2025-09-15 05:15:59 +00:00
birkskyum 59cf0fc47c deploy: 5312d61598 2025-09-14 09:49:28 +00:00
HarelM bc8f9fd685 deploy: 56cdfd23df 2025-09-14 09:13:23 +00:00
HarelM 542e7777d8 deploy: 69143ea5d6 2025-09-14 08:14:50 +00:00
HarelM 12c5dd912b deploy: a322afdcee 2025-09-13 22:47:26 +00:00
HarelM 95dbed3f69 deploy: c6f599cc61 2025-09-13 20:12:13 +00:00
HarelM 3acf7ccf5b deploy: 42e1273241 2025-09-11 17:44:17 +00:00
HarelM 6c4758c89c deploy: d81316435b 2025-09-11 10:10:22 +00:00
HarelM 9bfea8f868 deploy: c3c6118df1 2025-09-10 11:45:37 +00:00
HarelM 2d2a4739f1 deploy: 9c85883b8a 2025-09-10 11:38:22 +00:00
HarelM fd218db356 deploy: 3725f83b48 2025-09-09 22:53:51 +00:00
HarelM bc2b08ed92 deploy: 7bfc3188f7 2025-09-09 22:47:57 +00:00
HarelM 9af15e5359 deploy: 25d6e9693d 2025-09-09 22:18:15 +00:00
HarelM 669781ccca deploy: 7fc334ad85 2025-09-09 14:33:27 +00:00
HarelM 18da95d2a6 deploy: 55a487d0c8 2025-09-08 19:09:30 +00:00
HarelM b47d105e1f deploy: abe6230932 2025-09-08 12:23:28 +00:00
HarelM 5f9c21cf2b deploy: 6f4c34b29a 2025-09-07 14:43:38 +00:00
HarelM 956d24c524 deploy: 54c1b761fd 2025-09-07 14:30:51 +00:00
HarelM 4e02c6e12d deploy: 4d5c74f4ee 2025-09-07 10:06:13 +00:00
HarelM e9966e5a20 deploy: e2e29d7f5e 2025-08-17 08:07:25 +00:00
birkskyum 3deb491306 deploy: 727bc7dfae 2025-08-07 18:35:15 +00:00
louwers 34572dc3f0 deploy: b2fa703ceb 2025-07-10 04:07:56 +00:00
louwers 6bf79c2121 deploy: 3ddb55aec7 2025-07-05 18:31:48 +00:00
louwers a925995f89 deploy: 2fef0467b6 2025-07-05 12:47:58 +00:00
louwers c674575fbc deploy: eb985f4d95 2025-07-05 11:59:23 +00:00
louwers b030a2a707 deploy: c486aa2139 2025-07-05 11:56:00 +00:00
louwers 74aa3b48db deploy: 533f647c71 2025-07-05 09:33:30 +00:00
louwers a399df0adc deploy: 4b977fd33e 2025-07-04 21:50:06 +00:00
louwers 1282062b32 deploy: e58b92b0cd 2025-07-04 20:22:52 +00:00
louwers bb243db63c deploy: 599240033a 2025-07-04 08:28:00 +00:00
HarelM 45c1281490 deploy: 851e4bad21 2025-06-13 04:20:07 +00:00
nyurik 40e452d547 deploy: 19389ca3d3 2025-05-28 18:39:19 +00:00
HarelM 2e62b1802a deploy: 4f52df7c3b 2025-05-04 04:40:44 +00:00
HarelM ea4c3f4e3e deploy: b6afbb0321 2025-04-21 19:45:41 +00:00
HarelM 19c538a29e deploy: d691d49538 2025-03-28 13:34:48 +00:00
HarelM d379d462f2 deploy: 699241b691 2025-03-14 20:35:35 +00:00
nyurik 8eb9fe062f deploy: 9540686b40 2025-02-25 10:02:16 +00:00
HarelM 9ca274805c deploy: da361509d2 2025-02-04 06:36:51 +00:00
birkskyum fc507c7e79 deploy: abf3bd1fa0 2025-01-28 12:58:40 +00:00
HarelM 66453a46ca deploy: b87c8fb5c3 2025-01-25 07:25:28 +00:00
HarelM 96b0c53fd2 deploy: 5af2cc2f9e 2025-01-23 09:00:05 +00:00
birkskyum 663034b749 deploy: dcdbac35ff 2025-01-22 11:43:15 +00:00
birkskyum c82696d268 deploy: 2852fa62ff 2025-01-22 10:39:26 +00:00
birkskyum 7d987cf68b deploy: 87cd79e86f 2025-01-21 21:39:06 +00:00
birkskyum 075437555a deploy: cd7d607f13 2025-01-21 15:22:33 +00:00
HarelM 654dc9c31b deploy: b429bb16d7 2025-01-21 14:26:07 +00:00
birkskyum 2c8bc5aa04 deploy: a21efcc4d5 2025-01-21 13:48:26 +00:00
HarelM 07bee66764 deploy: 3e6994084c 2025-01-21 13:25:16 +00:00
HarelM f675c7ff7b deploy: 69e4888d71 2025-01-21 12:25:50 +00:00
HarelM ad85fd8f12 deploy: 2a3e7ea4bb 2025-01-21 12:09:54 +00:00
HarelM 634d664e46 deploy: a97287a66e 2025-01-21 12:09:04 +00:00
HarelM 0046122c87 deploy: 9a866179b7 2025-01-21 12:01:16 +00:00
HarelM c0f798a6f6 deploy: 84e9a73d86 2025-01-21 12:00:58 +00:00
HarelM 47941e3738 deploy: 53fbc1ffe9 2025-01-21 11:57:51 +00:00
HarelM 237457a159 deploy: b357e1f352 2025-01-21 11:57:31 +00:00
HarelM d9dad5614e deploy: c5f6d51ea1 2025-01-21 11:54:31 +00:00
HarelM f18a594131 deploy: 117f37139e 2025-01-21 11:53:25 +00:00
HarelM fde3d8fc18 deploy: 39aef39b72 2025-01-21 11:52:48 +00:00
HarelM a493d6df52 deploy: 1657aa4676 2025-01-21 11:50:24 +00:00
HarelM 7e8eca6f97 deploy: b09d41e41d 2025-01-21 11:49:20 +00:00
HarelM c3764b65d9 deploy: f17f529ede 2025-01-21 11:48:57 +00:00
HarelM 56e151329d deploy: f12af91a55 2025-01-21 11:48:16 +00:00
HarelM 28d6589928 deploy: e87e122067 2025-01-21 11:47:53 +00:00
birkskyum 7adf516383 deploy: 6af3165418 2025-01-21 10:23:43 +00:00
birkskyum 9a1385823e deploy: b1d4b53548 2025-01-21 09:51:57 +00:00
HarelM 2fc5ab4509 deploy: 69124d0752 2025-01-21 08:49:52 +00:00
HarelM 3108b88e59 deploy: 405b8aa951 2025-01-16 21:54:38 +00:00
HarelM b910e4fdb6 deploy: d50ea76347 2025-01-09 16:55:36 +00:00
louwers 907c09a927 deploy: c6174a57d9 2024-11-25 11:41:18 +00:00
HarelM 16fb99d9b1 deploy: af01346279 2024-11-14 21:54:28 +00:00
HarelM a364176a3e deploy: 687f9abaf2 2024-10-31 19:04:51 +00:00
HarelM 48164f5a9d deploy: 172d4d5278 2024-10-15 07:13:06 +00:00
HarelM 046b1b3bb2 deploy: b03af2c039 2024-09-29 13:10:39 +00:00
HarelM f33e09df62 deploy: 6089cde302 2024-09-29 12:02:38 +00:00
HarelM 7333eb6378 deploy: 25cf61a825 2024-09-25 07:23:54 +00:00
HarelM ffdc04b3aa deploy: 0f1000c5b0 2024-09-18 04:02:23 +00:00
louwers 223809dda5 deploy: fa4ece22cf 2024-09-16 23:39:50 +00:00
HarelM 744ad0f917 deploy: 00f431c50e 2024-09-03 05:25:36 +00:00
HarelM 2f324c695b deploy: 60785f53bc 2024-09-02 09:45:51 +00:00
HarelM dd4cbb1b3d deploy: 32fa02d289 2024-09-01 06:59:24 +00:00
HarelM e61aa393c6 deploy: 482e6ec545 2024-08-29 19:15:18 +00:00
HarelM e9c24d5ac9 deploy: 4dd34e99fd 2024-08-29 17:23:36 +00:00
HarelM a7ed7cdb45 deploy: 66c5a5c953 2024-08-29 14:08:36 +00:00
HarelM dea98ad7b6 deploy: 8184ac8393 2024-08-21 05:58:07 +00:00
HarelM 987c3cd31e deploy: 6a0d2e8ee5 2024-08-21 04:18:41 +00:00
HarelM 6d970fe73f deploy: 58edd262b0 2024-08-19 09:44:12 +00:00
nyurik 9cfd0ced73 deploy: 35840409b8 2024-07-26 02:51:28 +00:00
HarelM 1464a337e3 deploy: d0f6e0fadb 2024-07-12 18:19:25 +00:00
HarelM 1eaba084ed deploy: 0de304ca3e 2024-06-24 05:10:30 +00:00
HarelM 37ba7457d5 deploy: c82c6158e6 2024-05-29 07:48:23 +00:00
HarelM 43a7c058fd deploy: 41cd7dfad1 2024-05-20 11:44:06 +00:00
HarelM 87c7c7ff93 deploy: 7591b031ce 2024-04-16 05:27:23 +00:00
HarelM 8c8241b13b deploy: f34529ef06 2024-04-03 17:27:41 +00:00
HarelM c187f02c27 deploy: a73b11805d 2024-03-26 23:13:29 +00:00
HarelM 617adcdc48 deploy: ff15b77b7f 2024-03-21 20:52:33 +00:00
HarelM e71c49e38c deploy: 355b663e7e 2024-03-14 19:03:54 +00:00
HarelM 9572eefd48 deploy: 3c043fd5e0 2024-03-13 20:49:07 +00:00
HarelM 3303a25737 deploy: 5f54dd0ccf 2024-03-09 21:04:29 +00:00
HarelM 49f91a69f1 deploy: 3727f5da48 2024-02-21 05:18:43 +00:00
HarelM c853c754b1 deploy: bc5ecfade6 2024-02-07 08:33:35 +00:00
HarelM 1b5596052c deploy: c84c7a7b96 2024-02-04 14:39:01 +00:00
HarelM 1c1b5cd208 deploy: cb77c6b4e2 2024-02-04 09:38:30 +00:00
HarelM c948814efc deploy: ea42f434eb 2024-02-04 08:02:30 +00:00
HarelM 7b9d3512c6 deploy: 6f82c12861 2024-02-04 07:19:30 +00:00
HarelM edf3a58ea6 deploy: 3b95b25777 2024-01-13 12:40:08 +00:00
HarelM 5a4b5fb9e9 deploy: 1da65f2116 2024-01-12 16:47:24 +00:00
HarelM 6f9f53add6 deploy: a62db148cd 2024-01-12 09:01:06 +00:00
HarelM e0199c9ce7 deploy: 6ed10a862f 2024-01-11 20:58:23 +00:00
Harel M e1ed42f16f Fix static files reference 2024-01-11 20:00:59 +00:00
Harel M 104c3c0c10 another attempt to fix base-href 2024-01-11 19:53:30 +00:00
Harel M f4a1aa4729 Add base tag to html 2024-01-11 19:48:33 +00:00
Harel M fda7fac260 Publish the current version of maputnik 2024-01-11 19:45:24 +00:00
Harel M 87cf81d1c9 Prepare for on boarding (#858)
I believe this solves most of the missing checkboxes:
- https://github.com/maplibre/maplibre/issues/352

Let me know if there's anything else missing.
Other configuration can be done after the repo has been migrated I
believe.
2024-01-11 17:08:42 +02:00
ShellyDCMS 8e35ed97e6 Improve drivers (#856)
Co-authored-by: shelly_goldblit <shelly_goldblit@dell.com>
Co-authored-by: HarelM <harel.mazor@gmail.com>
2024-01-02 12:12:06 +02:00
Harel M 124ae98bf3 E2E: Improve tests, lint, and add more drivers (#855)
This PR introduces lint to cypress code, adds drivers to try and
abstract the usage of cypress as much as possible.
Nothing very interesting, mainly to try out the driver pattern for the
e2e tests.
2023-12-27 20:58:24 +02:00
Harel M b784bf2b84 Improve tests (#854)
Recover commented out tests, 
Improve usage of helper in driver, 
Added data-wd-key for test to use instead of classes
Moved all non tsx file to a single folder (lib) instead of lib and utils

---------

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-12-27 10:19:59 +02:00
Max 09a1f3f87b Use nginx to serve built files (#808)
Resolves #842
Better suited than python + handles sigterm better

Co-authored-by: Harel M <harel.mazor@gmail.com>
2023-12-26 23:28:17 +02:00
Harel M a22476cab2 Add lint to CI and fix errors (#853)
Adds lint to CI and fixes errors.
I'm not sure I'm fully proud of all the solutions there.
But there's no lint issues and the lint is being checked as part of the
CI.

---------

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-12-26 23:13:22 +02:00
ShellyDCMS a324ddb654 add code coverage (#852)
Add Cypress code coverage using Istanbul nyc

![image](https://github.com/maputnik/editor/assets/60476837/e7c364b7-7b54-4bf1-85aa-ee6fb19cc40c)

---------

Co-authored-by: shelly_goldblit <shelly_goldblit@dell.com>
Co-authored-by: Harel M <harel.mazor@gmail.com>
2023-12-26 12:04:43 +02:00
Harel M 656264f2bc Migration of jsx files to tsx 3 (#851)
This is in continue to:
- #850
- #848

The last files should be converted as part of this PR, there are only a
handful left.
2023-12-25 15:48:46 +02:00
Harel M 974dd7bfd9 Migration of jsx files to tsx 2 (#850)
This is to continue the work of migrating all the jsx files into tsx
files.
The MO is basically described here: #848.

About 7 files to go...
2023-12-22 23:32:25 +02:00
Harel M fa182e66fa Migration of jsx files to tsx 1 (#848)
In this PR I have changed some of the jsx files to tsx file.
I'm starting off with the "leafs" so that migration of the rest will be
easier, hopefully.

What I'm basically doing is taking a jsx file, copy paste it into:
https://mskelton.dev/ratchet

And after that I'm fixing the types as needed.
It's not a very long process.

Hopefully more PRs will follow and this will be over soon.
I don't plan to migrate the storybook as I generally don't understand
why is it useful, I'll open an issue to see if anyone thinks
differently.
2023-12-21 23:46:56 +02:00
Harel M 3bf0e510e6 Migrate all the non react components code to typescript (#847)
This completes the migration to typescript of all the non react
components code.
The only changes introduced besides types are the type checks using
`"something" in object` which narrows down types in typescript.
2023-12-21 00:07:53 +02:00
Harel M e8d07fa694 Initial migration to typescript (#845)
This migrates some utilities classes from javascript to typescript.
Nothing special about the migration, mainly added types and made sure
the code adheres to the strict mode.

I have picked some small files so git doesn't think they are the same
since they are "very different".
I hope that in later PRs, when migrating lager files this won't be an
issues.
2023-12-20 22:56:33 +02:00
Harel M 4d1e2e6893 Refactor driver for E2E (#843)
This is basically the content of #841 with the code review changes and
relevant fixes to tests/driver code to pass the tests.
CC: @ShellyDCMS

After this we should lint the project and add the lint to the CI to make
sure it doesn't break.

---------

Co-authored-by: ShellyDCMS <60476837+ShellyDCMS@users.noreply.github.com>
Co-authored-by: shelly_goldblit <shelly_goldblit@dell.com>
2023-12-20 16:34:46 +02:00
Harel M f219ff1e17 Fix favicon (#844)
This PR fixes the missing facicon.
As part of the migration to vite, this issue was introduced.
- #836
2023-12-20 07:18:13 +02:00
Yuri Astrakhan 8eabfa5519 Fix incorrect CI tag filter (#838) 2023-12-18 06:21:43 +02:00
Harel M ad69cbdb20 Vite + TypeScript (#836)
Resolves #803

This is an initial commit to allow migrating to typescript bit by bit.
It introduces vite.
It removes all the webpack configuration (which I have no clue what all
the profiling are needed for, and couldn't find anything in the readme).
It also changes a single file from javascript to typescript:
`urlopen.js` -> `urlopen.ts`
Which was done manually, later on I'll see if I can automate most of the
migration.
For now, everything seems to work as expected.
I also upgrades storybook to use vite and renames the stories to jsx (I
honestly don't know why this complexity is needed here, but I'll keep it
for now).

cc: @damianstasik
2023-12-17 22:52:19 -05:00
Yuri Astrakhan 17eaa3f204 Rename primary branch to main (#837)
Co-authored-by: Harel M <harel.mazor@gmail.com>
2023-12-18 00:09:10 +02:00
Harel M 1df2e36dbb Replace WebDriverIO with Cypress (#831)
This does the following:
1. Moves the WDIO code from javascript to typescript
2. Moves to use files that are `cy.ts` instead of `index.js`
3. Replace e2e to use cypress
4. Introduce back some skipped tests

This is in continue to the conversation here:
https://github.com/HarelM/editor/pull/3

Before:
```
 "spec" Reporter:
------------------------------------------------------------------
[chrome 120.0.6099.71 linux #0-0] Running: chrome (v120.0.6099.71) on linux
[chrome 120.0.6099.71 linux #0-0] Session ID: ee9a87bcfce007ac7721929c6e6234d0
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0] » /test/functional/index.js
[chrome 120.0.6099.71 linux #0-0] maputnik
[chrome 120.0.6099.71 linux #0-0]     history
[chrome 120.0.6099.71 linux #0-0]        - undo/redo
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]     layers
[chrome 120.0.6099.71 linux #0-0]         ops
[chrome 120.0.6099.71 linux #0-0]            ✓ delete
[chrome 120.0.6099.71 linux #0-0]            ✓ duplicate
[chrome 120.0.6099.71 linux #0-0]            ✓ hide
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         background
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]             modify
[chrome 120.0.6099.71 linux #0-0]                 layer
[chrome 120.0.6099.71 linux #0-0]                    - expand/collapse
[chrome 120.0.6099.71 linux #0-0]                    ✓ id
[chrome 120.0.6099.71 linux #0-0]                    ✓ min-zoom
[chrome 120.0.6099.71 linux #0-0]                    ✓ max-zoom
[chrome 120.0.6099.71 linux #0-0]                    ✓ comments
[chrome 120.0.6099.71 linux #0-0]                    - color
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]                 filter
[chrome 120.0.6099.71 linux #0-0]                    - expand/collapse
[chrome 120.0.6099.71 linux #0-0]                    - compound filter
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]                 paint
[chrome 120.0.6099.71 linux #0-0]                    - expand/collapse
[chrome 120.0.6099.71 linux #0-0]                    - color
[chrome 120.0.6099.71 linux #0-0]                    - pattern
[chrome 120.0.6099.71 linux #0-0]                    - opacity
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]                 json-editor
[chrome 120.0.6099.71 linux #0-0]                    - expand/collapse
[chrome 120.0.6099.71 linux #0-0]                    - modify
[chrome 120.0.6099.71 linux #0-0]                    - parse error
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         fill
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]            - change source
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         line
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]            - groups
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         symbol
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         raster
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         circle
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         fill extrusion
[chrome 120.0.6099.71 linux #0-0]            ✓ add
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         groups
[chrome 120.0.6099.71 linux #0-0]            ✓ simple
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]     map
[chrome 120.0.6099.71 linux #0-0]         zoom level
[chrome 120.0.6099.71 linux #0-0]            - via url
[chrome 120.0.6099.71 linux #0-0]            - via map controls
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]     modals
[chrome 120.0.6099.71 linux #0-0]         open
[chrome 120.0.6099.71 linux #0-0]            ✓ close
[chrome 120.0.6099.71 linux #0-0]            - upload
[chrome 120.0.6099.71 linux #0-0]            ✓ load from url
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         shortcuts
[chrome 120.0.6099.71 linux #0-0]            ✓ open/close
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         export
[chrome 120.0.6099.71 linux #0-0]            ✓ close
[chrome 120.0.6099.71 linux #0-0]            - download
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         sources
[chrome 120.0.6099.71 linux #0-0]            - active sources
[chrome 120.0.6099.71 linux #0-0]            - public source
[chrome 120.0.6099.71 linux #0-0]            - add new source
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         inspect
[chrome 120.0.6099.71 linux #0-0]            ✓ toggle
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         style settings
[chrome 120.0.6099.71 linux #0-0]            ✓ name
[chrome 120.0.6099.71 linux #0-0]            ✓ owner
[chrome 120.0.6099.71 linux #0-0]            ✓ sprite url
[chrome 120.0.6099.71 linux #0-0]            ✓ glyphs url
[chrome 120.0.6099.71 linux #0-0]            ✓ maptiler access token
[chrome 120.0.6099.71 linux #0-0]            ✓ thunderforest access token
[chrome 120.0.6099.71 linux #0-0]            ✓ style renderer
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]         sources
[chrome 120.0.6099.71 linux #0-0]            - toggle
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]     screenshots
[chrome 120.0.6099.71 linux #0-0]        ✓ front_page
[chrome 120.0.6099.71 linux #0-0]        ✓ open
[chrome 120.0.6099.71 linux #0-0]        ✓ export
[chrome 120.0.6099.71 linux #0-0]        ✓ sources
[chrome 120.0.6099.71 linux #0-0]        ✓ style settings
[chrome 120.0.6099.71 linux #0-0]        ✓ inspect
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]     accessibility
[chrome 120.0.6099.71 linux #0-0]         skip links
[chrome 120.0.6099.71 linux #0-0]            ✓ skip link to layer list
[chrome 120.0.6099.71 linux #0-0]            ✓ skip link to layer editor
[chrome 120.0.6099.71 linux #0-0]            ✓ skip link to map view
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0]     keyboard
[chrome 120.0.6099.71 linux #0-0]         shortcuts
[chrome 120.0.6099.71 linux #0-0]            ✓ ESC should unfocus
[chrome 120.0.6099.71 linux #0-0]            ✓ '?' should show shortcuts modal
[chrome 120.0.6099.71 linux #0-0]            ✓ 'o' should show open modal
[chrome 120.0.6099.71 linux #0-0]            ✓ 'e' should show export modal
[chrome 120.0.6099.71 linux #0-0]            ✓ 'd' should show sources modal
[chrome 120.0.6099.71 linux #0-0]            ✓ 's' should show settings modal
[chrome 120.0.6099.71 linux #0-0]            - 'i' should change map to inspect mode
[chrome 120.0.6099.71 linux #0-0]            ✓ 'm' should focus map
[chrome 120.0.6099.71 linux #0-0]            ✓ '!' should show debug modal
[chrome 120.0.6099.71 linux #0-0]
[chrome 120.0.6099.71 linux #0-0] 44 passing (58.8s)
[chrome 120.0.6099.71 linux #0-0] 23 skipped
```

After:
```
accessibility
    skip links
      - skip link to layer list
      - skip link to layer editor
      - skip link to map view

history
    ✓ undo/redo (4894ms)

keyboard
    shortcuts
      ✓ ESC should unfocus (1912ms)
      ✓ '?' should show shortcuts modal (458ms)
      ✓ 'o' should show open modal (710ms)
      ✓ 'e' should show export modal (692ms)
      ✓ 'd' should show sources modal (588ms)
      ✓ 's' should show settings modal (894ms)
      ✓ 'i' should change map to inspect mode (804ms)
      ✓ 'm' should focus map (837ms)
      ✓ '!' should show debug modal (607ms)

layers
    ops
      ✓ delete (4313ms)
      ✓ duplicate (1780ms)
      ✓ hide (1862ms)
    background
      ✓ add (1675ms)
      modify
        layer
          - expand/collapse
          ✓ id (3735ms)
          ✓ min-zoom (2209ms)
          ✓ max-zoom (2127ms)
          ✓ comments (2515ms)
          ✓ color (2022ms)
        filter
          - expand/collapse
          - compound filter
        paint
          - expand/collapse
          - color
          - pattern
          - opacity
        json-editor
          - expand/collapse
          - modify
          - parse error
    fill
      ✓ add (1831ms)
      - change source
    line
      ✓ add (1844ms)
      ✓ groups (687ms)
    symbol
      ✓ add (2035ms)
    raster
      ✓ add (1814ms)
    circle
      ✓ add (1867ms)
    fill extrusion
      ✓ add (1963ms)
    groups
      ✓ simple (2653ms)

map
    zoom level
      ✓ via url (2279ms)
      ✓ via map controls (733ms)

modals
    open
      ✓ close (2519ms)
      - upload
      ✓ load from url (1557ms)
    shortcuts
      ✓ open/close (1136ms)
    export
      ✓ close (755ms)
      - download
    sources
      - active sources
      - public source
      - add new source
    inspect
      ✓ toggle (1020ms)
    style settings
      ✓ name (1085ms)
      ✓ owner (1060ms)
      ✓ sprite url (1214ms)
      ✓ glyphs url (1553ms)
      ✓ maptiler access token (1111ms)
      ✓ thunderforest access token (1102ms)
      ✓ style renderer (922ms)
    sources
      - toggle



      Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  accessibility.cy.ts                       52ms        3        -        -        3        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  history.cy.ts                            00:06        1        1        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  keyboard.cy.ts                           00:10        9        9        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  layers.cy.ts                             00:39       28       17        -       11        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  map.cy.ts                                00:04        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  modals.cy.ts                             00:16       18       12        -        6        - │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        01:18       61       41        -       20        -  
```

---------

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-12-17 21:49:23 +02:00
Birk Skyum 0c46affda9 Add dependabot (#826)
It has a low limit on how many PRs it's allowed to open at a time, so it
should not flood the repo.
2023-12-17 01:16:47 -05:00
Harel M 18f45e932b Use driver pattern for e2e tests (#829)
I've moved all the logic relevant to WBIO into a single file in order to
be able to replace it.
I have tried to upgrade WDIO in order to use the latest version and it
got stuck on my computer.
Furthermore, I was not able to run it locally which made this whole
cycle very long.
After this will be merged I will replace WDIO with cypress.
This doesn't change anything, only moves some code in the tests to a
single file, removes unneeded files and uses the driver pattern, which
will later allow switching the underline WDIO with Cypress.

cc: @nyurik
2023-12-17 01:14:23 -05:00
Yuri Astrakhan 31d56c9fae Bump CI versions (#830) 2023-12-17 00:49:34 -05:00
Birk Skyum b7838ad6e1 Use latest firefox (#825) 2023-10-23 08:06:02 +02:00
Birk Skyum c92fd12854 Bump to node 18 (#824) 2023-10-22 22:11:06 +02:00
Birk Skyum eb55796461 Merge pull request #823 from birkskyum/new-webdriver
Chrome new headless
2023-10-22 20:20:26 +02:00
Yuri Astrakhan 4b97f82980 Revert "Revert "Resolve #821 (#822)""
This reverts commit e4d559f953.
2023-10-21 18:33:48 -04:00
Yuri Astrakhan 5d0b6e3201 Revert "Revert "Added checkbox for cluster attribute (#810)""
This reverts commit 52f949e152.
2023-10-21 18:33:46 -04:00
Birk Skyum 5ab9be9fdb update node version 2023-10-22 00:27:41 +02:00
Birk Skyum 9659d41b83 chrome new headless 2023-10-22 00:20:55 +02:00
Yuri Astrakhan 52f949e152 Revert "Added checkbox for cluster attribute (#810)"
This reverts commit 393f4a38b9.
2023-10-21 18:19:24 -04:00
Yuri Astrakhan e4d559f953 Revert "Resolve #821 (#822)"
This reverts commit 577663f706.
2023-10-21 18:19:21 -04:00
zstadler 577663f706 Resolve #821 (#822)
Please see code analysis at
https://github.com/maputnik/editor/issues/821#issuecomment-1772360990
2023-10-20 11:01:20 -04:00
Eliav-B 393f4a38b9 Added checkbox for cluster attribute (#810)
* Added additional checkbox to set the cluster attribute when adding a GeoJson source

* Fixed default source function in the 'geojson_json' case

---------

Co-authored-by: shimon <ruisuhsh100@gmail.com>
2023-10-20 10:54:40 -04:00
Kevin Schaul 3727c9ad5e 814/remove mapbox references (#816)
Fixes #814

* fix: remove outdated references to mapbox
* docs: fix references in readme
* chore: fix mapbox references in tests
* chore: fix mapbox references in stories, webpack config
* chore: remove empty array
2023-08-28 22:17:49 -04:00
Yuri Astrakhan a99cbc00ba Merge pull request #812 from kevinschaul/switch-to-maplibre-ks
Convert from Mapbox GL to MapLibre
2023-07-18 23:32:11 +02:00
Kevin Schaul fe5f7e8b8c upgrade to setup-go@v3 2023-07-18 15:16:29 -05:00
Kevin Schaul 3ed4b8f2d7 add GOBIN to CI 2023-07-18 11:31:01 -05:00
Kevin Schaul f17c2e8112 reenable go modules in CI 2023-07-18 10:50:48 -05:00
Kevin Schaul 2be447f105 downgrade to node 16 to avoid ssl issue (for now) 2023-07-18 10:10:08 -05:00
Kevin Schaul 2fe6fa2be6 Update workflow to latest desktop, drop old node 2023-07-18 09:52:29 -05:00
Kevin Schaul 83dd21414b Merge branch 'master' into switch-to-maplibre-ks 2023-07-13 14:48:38 -05:00
Kevin Schaul 56d96a248d Remove JSON.stringify in call to validate 2023-07-13 14:43:18 -05:00
Kevin Schaul 5b1ee7296b Fix Buffer is undefined error 2023-07-13 14:35:16 -05:00
Kevin Schaul 8e0546fba4 Get map rendering with maplibre 2023-07-12 16:37:19 -05:00
Yuri Astrakhan 2ff3d08bb0 Merge pull request #796 from maputnik/dependabot/npm_and_yarn/async-2.6.4
Bump async from 2.6.3 to 2.6.4
2022-12-15 15:14:51 -05:00
dependabot[bot] afe7a492a7 Bump async from 2.6.3 to 2.6.4
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-15 19:54:14 +00:00
Yuri Astrakhan 1f26ab707f Merge pull request #792 from maputnik/dependabot/npm_and_yarn/deep-object-diff-1.1.9
Bump deep-object-diff from 1.1.7 to 1.1.9
2022-12-15 14:53:11 -05:00
Yuri Astrakhan 233191e27c Merge pull request #793 from maputnik/dependabot/npm_and_yarn/loader-utils-1.4.2
Bump loader-utils from 1.4.1 to 1.4.2
2022-12-15 14:52:58 -05:00
Yuri Astrakhan 246f9a191d Merge pull request #795 from maputnik/dependabot/npm_and_yarn/decode-uri-component-0.2.2
Bump decode-uri-component from 0.2.0 to 0.2.2
2022-12-15 14:52:17 -05:00
dependabot[bot] 07f6efe45d Bump decode-uri-component from 0.2.0 to 0.2.2
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-07 23:57:21 +00:00
dependabot[bot] ccd0402eea Bump loader-utils from 1.4.1 to 1.4.2
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-18 00:36:06 +00:00
dependabot[bot] 8ccee0ba75 Bump deep-object-diff from 1.1.7 to 1.1.9
Bumps [deep-object-diff](https://github.com/mattphillips/deep-object-diff) from 1.1.7 to 1.1.9.
- [Release notes](https://github.com/mattphillips/deep-object-diff/releases)
- [Commits](https://github.com/mattphillips/deep-object-diff/commits)

---
updated-dependencies:
- dependency-name: deep-object-diff
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-16 23:59:29 +00:00
Yuri Astrakhan d6b67be7b2 Merge pull request #780 from maputnik/dependabot/npm_and_yarn/ejs-3.1.7
Bump ejs from 3.1.6 to 3.1.7
2022-11-09 14:52:11 -05:00
Yuri Astrakhan ac56ea4627 Merge pull request #791 from maputnik/dependabot/npm_and_yarn/loader-utils-1.4.1
Bump loader-utils from 1.4.0 to 1.4.1
2022-11-09 14:51:37 -05:00
dependabot[bot] b00cf66ea6 Bump loader-utils from 1.4.0 to 1.4.1
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 03:55:59 +00:00
Luke Seelenbinder 8e329a0ff9 Remove missed reference to mapbox-gl.
* Also removes specialized support for Mapbox URLs.
2022-11-01 10:24:05 +01:00
Luke Seelenbinder 74cacd5bdf Initial work to convert from Mapbox GL v1.13 to MapLibre v2.4.0. 2022-10-27 14:02:47 +02:00
pathmapper 7d5fb23130 Merge pull request #782 from maputnik/dependabot/npm_and_yarn/got-11.8.5
Bump got from 11.8.3 to 11.8.5
2022-08-14 09:25:13 +02:00
pathmapper 08bbd55f13 Merge pull request #784 from maputnik/dependabot/npm_and_yarn/terser-4.8.1
Bump terser from 4.8.0 to 4.8.1
2022-08-14 09:25:00 +02:00
dependabot[bot] d6d4930513 Bump terser from 4.8.0 to 4.8.1
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-21 03:45:50 +00:00
dependabot[bot] 6220e15723 Bump got from 11.8.3 to 11.8.5
Bumps [got](https://github.com/sindresorhus/got) from 11.8.3 to 11.8.5.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v11.8.3...v11.8.5)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-23 14:02:05 +00:00
dependabot[bot] 72053a2dba Bump ejs from 3.1.6 to 3.1.7
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-07 04:59:25 +00:00
pathmapper bf27a35ef5 Merge pull request #778 from propheel/feat/updateDependencies
Update dependencies
2022-05-07 06:57:58 +02:00
Filip Proborszcz 4705bf823a Use geckodriver 0.30 for firefox until 0.31 works 2022-05-02 15:13:42 +02:00
Filip Proborszcz a8f6208561 Fix layer drag&drop and init warning 2022-05-01 11:28:15 +02:00
Filip Proborszcz af2629be75 Make layer list sortable again 2022-04-10 22:22:16 +02:00
pathmapper 8bfad6c9fd Merge pull request #777 from maputnik/npm-ci
Use npm ci for workflow
2022-04-09 07:51:55 +02:00
Filip Proborszcz 5c3713da90 Use proper version of array-move 2022-04-08 04:14:58 +02:00
Filip Proborszcz 174eae1cf4 Use selenium standalone service to run tests 2022-04-08 03:37:40 +02:00
Filip Proborszcz d73add77e7 Fixes for breaking changes
- new webpack dev server options
- babel support for async functions in hooks
- new uuid import style
- automatically open browser for testing
2022-04-08 02:23:43 +02:00
Filip Proborszcz ab00c9f426 Many dependency updates
@storybook 6.4.20 blocks most of others like: react 18, webpack 5,
and keeps lots of unnecessary dependencies due to chakra 2 dep.
2022-04-07 17:21:34 +02:00
pathmapper d6ab302815 Use npm ci for workflow
https://docs.npmjs.com/cli/v8/commands/npm-ci
2022-04-07 03:28:47 +02:00
pathmapper f5646f57d1 Merge pull request #776 from propheel/useNode16
Use node 16.x
2022-04-07 03:11:13 +02:00
Filip Proborszcz c77d8f6625 Use shared SHM for Docker image 2022-04-07 00:37:20 +02:00
Filip Proborszcz e34c1ca4be Use node 16.x
It required converting mocha tests code into async since [@wdio/sync is
deprecated](https://webdriver.io/docs/sync-vs-async/) starting with
node v16.
It removed the dependency on fibers and on [node-gyp + python](https://
webdriver.io/docs/sync-vs-async/#common-issues-in-sync-mode) indirectly
though which is a great thing.

Also moved away from node-sass to sass since [node-sass is deprecated]
(https://sass-lang.com/blog/libsass-is-deprecated).
2022-04-06 14:05:15 +02:00
Orange Mug 87745f1fc9 Merge pull request #752 from pathmapper/webpack_stats
Webpack stats
2021-08-06 17:59:46 +01:00
pathmapper 9ba0fd5f39 Remove yarn.lock 2021-08-04 09:44:33 +02:00
pathmapper 70decbb5c1 Change webpack-dev-server info 2021-08-04 09:36:37 +02:00
pathmapper 51fa4a4377 Merge pull request #739 from pathmapper/maputnik_tag
Request using 'maputnik' tag for SE questions
2020-10-10 20:16:33 +02:00
pathmapper fb6f4d73e2 Mention 'maputnik' tag in comment 2020-10-04 12:11:00 +02:00
pathmapper 63b14933ba Merge pull request #729 from orangemug/fix/issue-712-v2
Correctly upgrade old-style filter functions to expressions
2020-09-15 19:10:49 +02:00
Orange Mug a86c31cefa Merge pull request #727 from orangemug/feature/added-html-option-to-export
Added HTML export option to export modal.
2020-09-10 19:20:40 +01:00
orangemug 25e2554412 Another commit to force a rebuild 2020-09-10 18:07:47 +01:00
Orange Mug 34bb3bc0a7 Merge pull request #726 from orangemug/fix/issue-718
Fix to not change layer key while editing layer
2020-09-10 18:06:03 +01:00
orangemug 852243cd52 onChange -> onInput for <FieldId/> component. 2020-09-09 20:22:52 +01:00
Orange Mug 40faf86adf Merge pull request #725 from orangemug/fix/issue-710
Added 'base' to functions
2020-09-09 20:15:18 +01:00
Orange Mug bb69f143b8 Merge pull request #724 from orangemug/fix/issue-707
Remove key/value from style when editing style results in empty array
2020-09-09 20:14:58 +01:00
orangemug bb43200887 Move logic into checkIfSimpleFilter function and added FILTER_OPS check. 2020-09-09 16:12:18 +01:00
orangemug ae3f79f4ad Attempt to correctly upgrade old-style filter functions to expressions. 2020-09-09 15:55:20 +01:00
orangemug 731a315624 Merge remote-tracking branch 'upstream/master' into feature/added-html-option-to-export 2020-09-09 15:12:23 +01:00
orangemug 5e441454d5 Merge remote-tracking branch 'upstream/master' into fix/issue-718 2020-09-09 15:11:52 +01:00
orangemug a55716bbd9 Merge remote-tracking branch 'upstream/master' into fix/issue-710 2020-09-09 15:08:42 +01:00
orangemug 44aea3745e Merge remote-tracking branch 'upstream/master' into fix/issue-707 2020-09-09 15:07:35 +01:00
Orange Mug a572bc02a6 Merge pull request #728 from orangemug/fix/disable-host-check
Disable host check for codesandbox
2020-09-09 15:06:54 +01:00
orangemug 4dee95fa2e Added --disable-host-check 2020-09-09 15:02:14 +01:00
orangemug 381ff6292f Removed disableHostCheck from ./config/webpack.config.js 2020-09-09 14:56:39 +01:00
orangemug c12db1703b Changed start script for codesandbox. 2020-09-09 14:55:51 +01:00
orangemug 2676583833 Added start-sandbox script. 2020-09-09 14:55:12 +01:00
orangemug 6ca2af7f8a Change codesandbox check. 2020-09-09 14:46:09 +01:00
orangemug 553b17822d Try disable host check for codesandbox. 2020-09-09 14:19:06 +01:00
orangemug a6148e5f40 Added HTML export option to export modal. 2020-09-09 14:06:48 +01:00
orangemug 4f77629eb7 Fix to not change layer key while editing layer. 2020-09-08 17:58:33 +01:00
orangemug 9103d9560a Added 'base' to functions. 2020-09-08 16:50:29 +01:00
orangemug 06c63509f7 Remove key/value from style when editing style results in empty array 2020-09-08 16:12:41 +01:00
pathmapper bbe0af6c0e Merge pull request #716 from pathmapper/Use-desktop-v1.0.7
Use desktop v1.0.7 for CI workflow
2020-07-24 19:11:54 +02:00
pathmapper 7455ccc3b7 Use desktop v1.0.7 2020-07-24 18:41:11 +02:00
Orange Mug 8b766777ac Merge pull request #706 from orangemug/fix/input-label-a11y
Improved label accessibility
2020-06-30 10:50:37 +01:00
orangemug 8441abe907 Added padding to 'maputnik-doc-button' and removed cursor from doc label. 2020-06-30 10:30:26 +01:00
orangemug ca56951256 Fix styling in export model 2020-06-30 09:48:55 +01:00
orangemug 5981151b27 Added cursor pointer to SDK docs button 2020-06-30 09:43:24 +01:00
orangemug 21dbc6c4d9 Added back in https://github.com/maputnik/editor link 2020-06-30 09:42:05 +01:00
Orange Mug 6f060c2a0a Merge pull request #708 from pathmapper/update_mb_deps
Update mb-gl
2020-06-30 09:27:02 +01:00
pathmapper 24327541c5 Update mb-gl 2020-06-30 09:16:53 +02:00
orangemug 0d6b9ee9d4 Fixed source modal CSS for new block definitions. 2020-06-29 16:26:28 +01:00
orangemug 3ad487dce7 Removed isRequired from label incase null. 2020-06-29 16:18:04 +01:00
orangemug a46c834874 Fixed data functions. 2020-06-29 16:14:35 +01:00
orangemug 67bdea1827 Re-added info button and SDK docs to fields after refactor. 2020-06-29 16:03:59 +01:00
Orange Mug cc4133aac1 Merge pull request #703 from pathmapper/fix_674
Add again shouldComponentUpdate
2020-06-29 15:41:49 +01:00
orangemug 4a6f58d61c Changed heading sizes for modals. 2020-06-10 20:37:46 +01:00
orangemug e3dc98b76d <h2/> -> <h1/> 2020-06-10 20:37:08 +01:00
orangemug 09373dda44 Fixed changing between zoom/data functions. 2020-06-10 20:26:39 +01:00
orangemug c4b05b62b3 Remove logging. 2020-06-10 19:44:05 +01:00
orangemug 06bccfab10 Fix for checkboxes within non-clickable label 2020-06-10 19:21:29 +01:00
orangemug b83c9a1ad9 Fix block styling issues. 2020-06-10 19:20:18 +01:00
orangemug 0279daf7bd 'getApplicationNode' doesn't appear to be required as the modal is already a dialog 2020-06-10 18:17:25 +01:00
orangemug bfada7cace Added aria-label to things that are otherwise labelled in the UI. 2020-06-10 18:16:43 +01:00
orangemug 6c751fe1c4 Updated maputnik/design to diagnose axe accessibility checker issue with SVGs 2020-06-10 17:18:11 +01:00
orangemug 34299c94ee Fixed some 'axe' accessibility checker issues. 2020-06-10 16:22:13 +01:00
orangemug 5804b3c72a CSS outline fixes for keyboard users. 2020-06-10 13:04:04 +01:00
orangemug 8ae6e9fc61 Fix to ignore click suppression on inputs 2020-06-10 13:02:38 +01:00
orangemug 40579c3e0c Added back in action buttons to input label/fieldset 2020-06-10 10:59:44 +01:00
orangemug f3906c8dd8 A role="navigation" should not be on <ul/> as it changes how screen readers announce them. 2020-06-10 10:25:56 +01:00
orangemug f911ed3522 Fix <InputColor/> issues when trying to close picker. 2020-06-10 10:10:40 +01:00
orangemug 2cc179acc1 Fixed more input accessibility issues, also
- Added searchParams based router for easier testing
 - Added more stories to the storybook
2020-06-09 19:11:07 +01:00
Orange Mug 2912db6e32 Merge pull request #704 from pathmapper/update_omt_styles
Update Basic and Toner styles
2020-06-06 12:32:34 +01:00
pathmapper 70eb3e785a Trigger codesandbox 2020-06-06 12:48:34 +02:00
pathmapper 8f944d9973 Empty Commit to trigger codesanbox again 2020-06-06 12:46:53 +02:00
pathmapper 8faf841f3d Update Basic and Toner 2020-06-06 11:29:24 +02:00
pathmapper d8ba8fcbfb Add again shouldComponentUpdate 2020-06-05 15:11:49 +02:00
orangemug d6f31ec82e Block* -> Field* 2020-06-03 17:11:47 +01:00
Orange Mug b19eacf4f9 Merge pull request #699 from orangemug/maintenance/component-refactor
Tidy of components + added storybook.js
2020-06-03 16:18:04 +01:00
Orange Mug 3d158a791a Merge pull request #698 from pathmapper/issue_668
Integrate desktop builds in ci workflow
2020-06-03 14:53:06 +01:00
pathmapper 04b3b42524 Use desktop version instead of SHA 2020-06-03 15:37:17 +02:00
pathmapper af92aac7ec Remove tests 2020-06-03 13:45:59 +02:00
orangemug 90dfbf37e0 Added 'a11y' and 'source' addons to storybook as well as more stories 2020-06-03 09:52:54 +01:00
pathmapper e21f412933 Update ci.yml 2020-06-03 10:26:44 +02:00
pathmapper da297fe82c Checkout a particular SHA
https://github.com/maputnik/editor/pull/698#issuecomment-636748873
2020-06-03 10:12:32 +02:00
orangemug 624ccb5b00 Tidy of components
- Moved all components into a single directory like nextjs
 - Made component names consistent with each other
 - Made component names consistent with their export class names
 - Added storybook for a few components with the aim to extend this further.
2020-06-01 16:09:32 +01:00
pathmapper 9f0e5641ab Integrate desktop builds in ci workflow 2020-05-31 21:54:53 +02:00
Orange Mug d07b40ccef Merge pull request #696 from orangemug/feature/add-more-functional-tests
Added more webdriver tests
2020-05-31 16:05:28 +01:00
orangemug e0abd8251d Remove temp file 2020-05-31 15:57:23 +01:00
orangemug 324452e714 Disable undo/redo again. 2020-05-31 15:48:20 +01:00
orangemug 8d3ad6b1a1 Added more functional tests. 2020-05-31 15:33:09 +01:00
Orange Mug 3d4cc34a08 Merge pull request #695 from pathmapper/node_14
Add Node 14 to CI workflow
2020-05-28 11:48:59 +01:00
pathmapper ff351716b6 Update node-sass 2020-05-28 12:26:28 +02:00
Orange Mug c963a8cc59 Merge pull request #694 from pathmapper/issue_templates
Point users to https://gis.stackexchange.com/ in issue template
2020-05-28 09:39:53 +01:00
Orange Mug 52ad980aef Merge pull request #693 from pathmapper/update-mb-deps
Update GL JS and Style Spec
2020-05-28 09:38:56 +01:00
pathmapper fb04cce650 Update wdio deps 2020-05-28 08:56:23 +02:00
pathmapper 4b8acb10b0 Add Node 14 2020-05-28 08:39:57 +02:00
pathmapper 86d67389fc Update bug_report.md 2020-05-28 08:30:11 +02:00
pathmapper 9dad53e444 Point users to https://gis.stackexchange.com/ 2020-05-28 08:23:14 +02:00
pathmapper d5afeb14c1 Update bug_report.md 2020-05-28 08:04:15 +02:00
pathmapper 85bb1d4d40 Update MB dependencies 2020-05-28 07:29:55 +02:00
Orange Mug d95e25d185 Merge pull request #692 from orangemug/feature/codesandbox-ci
Added back in codesandbox CI config
2020-05-27 11:12:00 +01:00
Orange Mug a88f2bc0a3 Merge pull request #691 from orangemug/fix/readme-styling
Fixed README styling
2020-05-27 11:11:46 +01:00
orangemug 5a4254d300 Added back in codesandbox CI config. 2020-05-27 10:45:52 +01:00
orangemug 6bfe2aa364 Reordered header items in README. 2020-05-27 10:37:01 +01:00
orangemug 0acd1fec0a Fixed README styling, updated logo and removed broken badges. 2020-05-27 10:32:03 +01:00
pathmapper 3046fedb55 Merge pull request #690 from pathmapper/other_issue_template
Add other issue template
2020-05-27 11:26:23 +02:00
Orange Mug 1574b49b01 Merge pull request #687 from orangemug/feature/github-actions-ci
Added new CI workflow using GitHub actions
2020-05-27 10:20:21 +01:00
pathmapper 4417a2d8f1 Add other issue template 2020-05-27 11:18:27 +02:00
pathmapper 1f34e927e7 Merge pull request #689 from pathmapper/master
Add issue template for bug report
2020-05-27 10:58:00 +02:00
pathmapper 9af6a537ef Update issue templates
Add custom bug report
2020-05-27 10:48:54 +02:00
Orange Mug 6e07142f13 Merge pull request #546 from nyurik/dockerfile
Optimize docker image
2020-05-25 09:41:15 +01:00
orangemug d2853f34a4 Removed meta-demo-comment as it won't work from forked repos 2020-05-25 06:58:57 +01:00
orangemug 7faed0d27e Added firefox tests and fixed docker deploy 2020-05-24 12:56:52 +01:00
Orange Mug 22101f93ad Merge pull request #686 from orangemug/fix/issue-322
Added tip to JSON editor about how to unfocus
2020-05-24 12:04:35 +01:00
orangemug 0661899d54 Fixes for code review comments. 2020-05-24 11:46:47 +01:00
Orange Mug 862ac84464 Merge pull request #683 from orangemug/fix/a11y-issue-320
Fix some accessibility issues
2020-05-24 11:44:41 +01:00
Orange Mug 1e4aadbb6d Merge pull request #684 from orangemug/fix/issue-533
Fix for updating available sources cache when updating style
2020-05-24 11:42:15 +01:00
orangemug ce731e7d6b Added new CI workflow using GitHub actions.
Also

 - Fixed screenshot tests
 - Fixed code coverage
 - Removed appveyor
 - Removed circleci
 - Updated wdio related dependencies
 - Added docker image deploy to the GitHub registry
2020-05-24 11:13:16 +01:00
orangemug 5448cdbe4e Don't remember state when toggling <AddModal/> 2020-05-21 10:07:22 +01:00
orangemug 315a9b82c0 Fixed for initial focus of JSON editor message. 2020-05-21 09:22:42 +01:00
orangemug 9e1c0e4c82 Added aria-hidden to JSON editor message. 2020-05-21 09:20:47 +01:00
orangemug 7db675e0d1 Added ESC note to JSON editor. 2020-05-19 12:21:12 +01:00
orangemug 0aa629164a Fix for updating available sources when updating style. 2020-05-19 10:24:59 +01:00
orangemug c2ec77e869 Fixed lint errors. 2020-05-18 19:41:09 +01:00
orangemug b28407a4a0 Accessibility fixes
- Aria landmarks
 - Title attributes to all icon only buttons
 - <Multibutton/> now internally a radio group
 - Replaced 1 'skip navigation link' with UI group links
 - Added map specific shortcuts to the shortcut menu
 - Hidden layer list actions from tab index
2020-05-18 19:37:49 +01:00
Orange Mug e3e6647e03 Merge pull request #682 from orangemug/fix/issue-681
Fix open modal URL entry to use form submission
2020-05-14 15:32:09 +01:00
orangemug eb0f833d49 Fixed typo. 2020-05-14 13:33:57 +01:00
orangemug c5c1dd12b9 Added missing prop validation 2020-05-14 13:27:43 +01:00
orangemug b7e414a042 Fix URL entry to use form submission and improved errors if protocol isn't present. 2020-05-14 12:13:47 +01:00
Orange Mug 81a6f31803 Merge pull request #680 from pathmapper/mb_styles
Fix token input
2020-05-14 11:49:33 +01:00
pathmapper 65cd050a18 Fix token input 2020-05-05 09:40:43 +02:00
Orange Mug c426dd7349 Merge pull request #673 from pathmapper/update_mb_dependencies
Update MB deps
2020-05-02 09:33:10 +01:00
Orange Mug c5af645546 Merge pull request #675 from nspringer-trimble/feature/inspect-source-name
Add source name to inspect popup
2020-05-02 09:32:07 +01:00
pathmapper 1bf0abfb5a Update MB deps 2020-04-30 09:18:13 +02:00
Nick Springer 18338de21a Add source name to inspect popup 2020-04-27 15:30:07 -04:00
Orange Mug 857117eb71 Merge pull request #666 from orangemug/fix/issue-646
Fix to make layer list header visible at all times
2020-04-26 10:15:33 +01:00
Orange Mug 8d86bca8b3 Merge pull request #671 from pathmapper/update_readme
Remove v1.7.0-beta from readme
2020-04-26 10:02:51 +01:00
orangemug dc4e6a0925 Fix vertical align of view/select in toolbar 2020-04-26 09:58:21 +01:00
pathmapper e9d6119ac6 Remove v1.7.0-beta from readme 2020-04-26 10:58:01 +02:00
orangemug cbdf45c852 Fixed <select/> styling in firefox and improved in chrome. 2020-04-26 09:23:18 +01:00
Orange Mug a191c36f96 Merge pull request #667 from orangemug/fix/issue-656
Support multiple tiles URLs for source
2020-04-25 13:52:30 +01:00
orangemug 0a8d0974ca Fixed field spec for image/video. 2020-04-25 13:31:15 +01:00
orangemug 8e6c54564b Add <DynamicArrayInput/> to source tile urls to support multiple values. 2020-04-25 11:38:13 +01:00
orangemug 4bbe2ce1ea Fix to make layer list header visible at all times.
Also improved scrollbar styling/positioning for toolbar and layers list.
2020-04-25 11:05:34 +01:00
orangemug 1d48ab7ecf 1.7.0 2020-04-23 21:12:38 +01:00
Orange Mug d85ed36e70 Merge pull request #663 from nspringer-trimble/patch-1
Fix for desktop build
2020-04-22 20:30:00 +01:00
Nick Springer b554f4427b Fix for desktop build 2020-04-21 09:17:30 -04:00
orangemug 184bfeeaf8 1.7.0-beta4 2020-04-20 13:13:36 +01:00
orangemug e45f8d960d Added space for beta tag in logo/version header 2020-04-20 13:12:48 +01:00
Orange Mug 1fede3af3a Merge pull request #661 from orangemug/fix/issue-660-v2
Added JSON linting back into <SourceTypeEditor/>
2020-04-20 13:09:29 +01:00
orangemug 5ad74048bd Added JSON linting back into <SourceTypeEditor/> 2020-04-20 11:07:08 +01:00
orangemug a0a91474de 1.7.0-beta3 2020-04-19 08:45:18 +01:00
Orange Mug c3670701e5 Merge pull request #606 from orangemug/fix/issue-591
Added style formatting into the api store
2020-04-19 08:38:37 +01:00
Orange Mug 86923330d9 Merge pull request #658 from pathmapper/feature_id_inspect
Add feature id to FeaturePropertyPopup
2020-04-19 08:00:00 +01:00
pathmapper 4517148e5a Add underscore to label 2020-04-18 11:43:52 +02:00
pathmapper 0433d66f45 Add feature id to FeaturePropertyPopup 2020-04-18 11:25:54 +02:00
Orange Mug 0c592bacab Merge pull request #650 from orangemug/fix/issue-647
Fixed crash raised in issue #647
2020-04-14 21:15:59 +01:00
Orange Mug d98637cb12 Merge pull request #645 from orangemug/feature/add-support-for-identity-functions
Add support for identity functions
2020-04-14 09:12:35 +01:00
orangemug 1070209cb5 Another attempt and maputnik inspect crashing issue. 2020-04-14 09:11:09 +01:00
orangemug b6189f77c4 Added icons to buttons. 2020-04-14 08:31:55 +01:00
Orange Mug 25322a3952 Merge pull request #655 from orangemug/fix/issue-653
Added missing inline error for 'source' field
2020-04-13 10:57:01 +01:00
Orange Mug 5943c6f282 Merge pull request #654 from orangemug/fix/issue-649
Fixed default values for <FontInput/>
2020-04-13 10:56:47 +01:00
orangemug 090a26bb40 Added missing inline error for 'source' field. 2020-04-13 09:10:30 +01:00
orangemug af03b010a4 Fixed default values for <FontInput/> 2020-04-13 08:53:33 +01:00
orangemug 578a920b6d Fixed crash raised in issue #647 2020-04-13 08:39:23 +01:00
pathmapper 0858a16ffc Merge pull request #644 from orangemug/fix/remove-heavy-thunderforest-tiles
Remove notes from thunderforest sources
2020-04-12 21:04:35 +02:00
orangemug 7cfe0563bc Added support for identity functions. 2020-04-12 16:25:32 +01:00
orangemug ee72389534 Remove mentions of 'heavy' from thunderforest tiles. 2020-04-12 12:14:56 +01:00
pathmapper 8f722c59de Merge pull request #642 from pathmapper/upgrade_thunderforest
Upgrade Thunderforest tilesets from v1 to v2
2020-04-11 15:48:03 +02:00
pathmapper 94d2e958eb Add version to titles 2020-04-10 18:23:31 +02:00
pathmapper d931c7cb38 Upgrade Thunderforest tilesets 2020-04-10 18:13:23 +02:00
orangemug 6da83c4670 1.7.0-beta2 2020-04-06 16:57:02 +01:00
Orange Mug d26af16003 Merge pull request #639 from orangemug/fix/only-scroll-layer-list-if-item-not-in-view
Only scroll to selected item in <LayerList/> if not already in view.
2020-04-06 16:55:26 +01:00
Orange Mug d75b86c927 Merge pull request #638 from orangemug/maintenance/update-deps-20200406
Update all deps
2020-04-06 16:54:06 +01:00
orangemug a0cd087ccc Revert webdriverio version updates. 2020-04-06 15:47:12 +01:00
orangemug 313b639a5f Only scroll to selected item in <LayerList/> if not already in view. 2020-04-06 15:30:16 +01:00
orangemug 93c45d5340 Update all deps. 2020-04-06 15:14:21 +01:00
Orange Mug 3be6cb5926 Merge pull request #637 from orangemug/fix/console-errors-2020-04-06
Fix a bunch of errors/warnings from the console
2020-04-06 15:06:39 +01:00
Orange Mug 9d151fdc1f Merge pull request #636 from pathmapper/promote_beta
Promote v1.7.0-beta in readme
2020-04-06 14:32:29 +01:00
orangemug 44d1a7a6b0 {arrayMove} will no longer be included in 'react-sortable-hoc', move to array-move. 2020-04-06 14:18:41 +01:00
pathmapper 0e5676eae0 Promote v1.7.0-beta in readme 2020-04-06 15:14:42 +02:00
orangemug b8739915b2 Lots of smaller fixes found in the console logs during testing. 2020-04-06 13:59:08 +01:00
Orange Mug a1dedd1aa6 Merge pull request #634 from orangemug/fix/issue-630
Scroll selected <LayerListItem/> into view
2020-04-06 13:11:53 +01:00
Orange Mug 33b4a40c35 Merge pull request #635 from orangemug/fix/issue-633
Fixes for <NumberInput/>
2020-04-06 13:10:48 +01:00
orangemug a624909819 Reset dirtyValue on resetValue 2020-04-06 10:40:30 +01:00
orangemug d5d387f349 Removed placeholder on range (doesn't work) in favour 'default' value merged into 'value'. 2020-04-06 10:24:31 +01:00
orangemug c58ae0f895 Fix <NumberInput/> to allow for decimal numbers. 2020-04-06 09:55:07 +01:00
orangemug c9e360d675 Fix layer selection via <FeatureLayerPopup/> 2020-04-06 08:47:13 +01:00
orangemug 75ece350bd Merge remote-tracking branch 'upstream/master' into fix/issue-630 2020-04-04 15:48:52 +01:00
Orange Mug 45680151ef Merge pull request #632 from orangemug/fix/color-popup-swatch
Fix color in <FeatureLayerPopup/>
2020-04-04 15:48:35 +01:00
orangemug 87bae82b17 Merge remote-tracking branch 'upstream/master' into fix/issue-630 2020-04-04 15:44:29 +01:00
orangemug fcad636f85 Scroll selected <LayerListItem/> into view 2020-04-04 15:41:35 +01:00
orangemug bac8495b3c Made <FeatureLayerPopup/> swatch simplier because colors from features are already evaluated 2020-04-04 10:45:11 +01:00
orangemug df98cb9c7b Fix layer color swatch in <FeatureLayerPopup/> 2020-04-04 10:21:58 +01:00
Orange Mug 34c3015b42 Merge pull request #625 from orangemug/fix/invalid-style-with-duplicate-layer-ids
Fix UI when loading invalid style with duplicate layer ids
2020-03-30 20:38:25 +01:00
orangemug 7d51ea9b25 1.7.0-beta 2020-03-30 17:44:26 +01:00
orangemug ca7bf9f4a7 Fixed lint errors. 2020-03-30 09:57:14 +01:00
orangemug 61ba399e1c Duplicate layer ids now show errors inline. 2020-03-30 09:47:46 +01:00
orangemug b5c09a4f17 Merge remote-tracking branch 'upstream/master' into fix/invalid-style-with-duplicate-layer-ids 2020-03-30 08:52:37 +01:00
Orange Mug fcfc7ab874 Merge pull request #626 from orangemug/fix/issue-321-accessible-layer-groups
Moved to using react-accessible-accordion for <LayerEditorGroup/>
2020-03-29 16:12:33 +01:00
pathmapper a0bc4744a2 Merge pull request #627 from orangemug/fix/make-scrollbar-wider
Wider scrollbar
2020-03-29 13:55:55 +02:00
orangemug e6e4c928f3 Make the scrollbar wider so it's easier to grab with the mouse pointer. 2020-03-29 07:40:43 +01:00
orangemug 00388e03b8 Moved to using react-accessible-accordion for <LayerEditorGroup/> 2020-03-28 12:53:46 +00:00
orangemug 6f83839a4c Added missing file. 2020-03-28 11:06:45 +00:00
orangemug 74b47e7e74 Fix UI when loading invalid style with duplicate layer ids.
Also fix for throwing error when 2 layers exist with empty strings as ids.
2020-03-28 10:58:47 +00:00
Orange Mug f70d078ec6 Merge pull request #624 from orangemug/maintenance/update-deps-20200328
Update dependencies
2020-03-28 09:49:59 +00:00
orangemug 1d8131fb85 Update dependencies. 2020-03-28 08:33:57 +00:00
Orange Mug 8c82db9162 Merge pull request #620 from orangemug/feature/ui-errors-and-expressions
Added support for expressions and UI errors
2020-03-27 17:51:02 +00:00
orangemug f23f60807a Tidy 2020-03-16 10:17:04 +00:00
orangemug 8f581956e8 Revert jsonlint 2020-03-08 19:00:36 +00:00
orangemug 87fb0f6a5c Updated lockfile. 2020-03-08 18:44:04 +00:00
orangemug 1c953bc296 Remove old hack 'src/vendor/codemirror/addon/lint/json-lint' 2020-03-08 18:43:46 +00:00
orangemug ce976991d4 Added inline errors to the code-mirror editors based on field spec. 2020-03-08 18:38:32 +00:00
orangemug be7642976b Can't use object as react-dom key. 2020-02-25 09:27:29 +00:00
orangemug a5b226d9f3 Fixed lint error. 2020-02-25 09:25:52 +00:00
orangemug 1b3d8b5b79 Added JSON error to expression editor 2020-02-25 09:20:14 +00:00
orangemug 97a61afc24 Merge remote-tracking branch 'upstream/master' into feature/ui-errors-and-expressions 2020-02-23 13:34:05 +00:00
Orange Mug d1f6bc95db Merge pull request #621 from orangemug/fix/CheckboxInput-props-error
Added default to <CheckboxInput/> value to fix warning in console.
2020-02-23 13:24:16 +00:00
orangemug 10b03c4e00 Also fixed invalid DOM nesting warning. 2020-02-22 18:47:46 +00:00
Orange Mug 449d8e7665 Merge pull request #617 from orangemug/fix/map-controls-and-improve-zoom-styling
Improved map control zoom styling
2020-02-22 18:41:05 +00:00
orangemug 4b8800e8ac Added default to <CheckboxInput/> value to fix warning in console. 2020-02-22 18:39:24 +00:00
orangemug 874c6460f6 Merge remote-tracking branch 'upstream/master' into fix/map-controls-and-improve-zoom-styling 2020-02-22 17:59:24 +00:00
orangemug 55cb86f721 Disabled survey modal on first visit to website. 2020-02-22 17:52:20 +00:00
orangemug a30017fd2c Inline survey modal image 2020-02-22 17:50:14 +00:00
orangemug 3b5ba6c59e Fixed lint errors. 2020-02-22 13:15:55 +00:00
orangemug a693f6db4e Added infobox for old style filters to allow you to switch to the filter editor. 2020-02-22 11:54:59 +00:00
Orange Mug 5be7e0c7ec Merge pull request #619 from orangemug/maintenance/update-deps-20200217-v2
Update all the deps
2020-02-22 08:57:07 +00:00
orangemug 7c6b3c0d80 Bumped deps. 2020-02-21 09:07:25 +00:00
orangemug e5e03be382 Fixed missing command update to appveyor.yml 2020-02-21 08:46:46 +00:00
orangemug 0d35106cc8 Tidy test scripts. 2020-02-21 08:06:01 +00:00
orangemug 5710edcff7 Fixed invalid lockfile. 2020-02-18 21:42:25 +00:00
orangemug 2cc7c63bb1 Updated to new webdriverio config api, and fixed failing tests. 2020-02-18 21:39:11 +00:00
orangemug ba9d21c045 Merge remote-tracking branch 'upstream/master' into maintenance/update-deps-20200217-v2 2020-02-18 19:10:20 +00:00
orangemug 4ef6ecb7eb Moved from magnify icon to 'zoom:' label. Also increased contrast on compass arrow. 2020-02-18 18:50:30 +00:00
orangemug 52e8b21b3d Tidy function. 2020-02-18 08:06:36 +00:00
Orange Mug c6ba4f66e2 Merge pull request #618 from orangemug/feature/improve-loader
Added improved loader with maputnik logo
2020-02-18 07:50:56 +00:00
orangemug 5a47a96f09 Update all the deps 2020-02-17 19:38:59 +00:00
orangemug ae878f6000 Added missing plugin from production. 2020-02-17 19:03:19 +00:00
orangemug aebfe62a8e Fixed image path. 2020-02-17 18:55:28 +00:00
orangemug 6be3543616 Added improved loader. 2020-02-17 18:52:16 +00:00
orangemug 0f6708d9d4 Improved zoom styling and fixed zoom in/out button styling. 2020-02-17 15:39:54 +00:00
orangemug 0705522a24 Fixed width issue with expression error UI. 2020-02-17 13:44:05 +00:00
orangemug 35098111ac Include missing errors from expressions UI. 2020-02-17 13:41:11 +00:00
orangemug 39333953d7 Only show 'switch to layer' button if layer not already selected. 2020-02-17 13:24:14 +00:00
orangemug adea3d0f13 Added ability to switch to layer from global error panel. 2020-02-17 13:19:26 +00:00
orangemug d1cb2690fc Fixed lint errors. 2020-02-17 11:55:16 +00:00
orangemug 3ffdcc9639 Added the ability to convert from data/zoom function to expression 2020-02-17 11:52:40 +00:00
orangemug 793b5d15ad Fixed lint errors 2020-02-17 11:30:48 +00:00
orangemug cff32696cc Better handling of undo history for expressions. 2020-02-17 11:29:05 +00:00
orangemug 029eff9317 Added margin-left to function errors to line up with values. 2020-02-16 22:02:05 +00:00
orangemug b7d08dfaa6 Fixed data function display issues. 2020-02-16 21:56:03 +00:00
orangemug 94089836bf Fixed lint errors. 2020-02-16 21:30:27 +00:00
orangemug ff8a8fb749 Added errors to filter functions 2020-02-16 21:25:41 +00:00
orangemug 1300951a29 Removed height from '.maputnik-layout-bottom' to allow it to expand. 2020-02-16 20:31:51 +00:00
orangemug 3cb1ed9403 Made function to check if expression/function more robust. 2020-02-16 20:25:43 +00:00
orangemug a5ac1cc93d Guard against errors producing dirty map state. 2020-02-16 18:22:21 +00:00
orangemug 29a0ef0d1c Change to always attempt rendering of map state, even if broken, allowing the user to fix style issues step-by-step. 2020-02-16 18:11:47 +00:00
orangemug 26907f7014 Fix button style in disabled state as reported by @pathmapper 2020-02-16 17:34:23 +00:00
orangemug 3ac06c7cb1 Merge remote-tracking branch 'upstream/master' into feature/ui-errors-and-expressions 2020-02-10 15:57:25 +00:00
Orange Mug f268f09ca2 Merge pull request #616 from orangemug/fix/error-bar-width
Fixed overflowing error bar
2020-02-10 15:50:53 +00:00
orangemug f4c18fd91b Fixed error bar from overflowing. 2020-02-09 17:23:50 +00:00
orangemug 0567b098ec Fixed undo button disabled state for expressions. 2020-02-09 16:48:52 +00:00
orangemug dc6006fd6d Fixed lint errors. 2020-02-09 16:36:17 +00:00
orangemug 109261ba00 Fixed filter defaults and removed auto-migrate. 2020-02-09 16:33:47 +00:00
orangemug b539644b2b Added expression support for filters. 2020-02-09 15:08:24 +00:00
orangemug be36eec93d Added 'undo' alongside 'trash' button 2020-02-08 10:38:31 +00:00
pathmapper fe5066a2a4 Merge pull request #614 from orangemug/fix/map-container-background-color
Make background map container white to match html page default
2020-02-02 17:59:35 +01:00
Orange Mug 642e5c0b29 Merge pull request #613 from orangemug/fix/brackets-color-clash-with-cursor
Changed bracket matching color
2020-02-02 15:26:39 +00:00
orangemug 97bdc93a39 Fixed lint error. 2020-02-02 11:56:51 +00:00
orangemug c770b440c2 Make background map container white to match html page default. 2020-02-02 11:47:37 +00:00
orangemug 7559985a2e Changed bracket matching color so it doesn't clash with cursor. 2020-02-02 11:32:58 +00:00
orangemug 532bbecb47 Only disable <LayerTypeBlock/> in <LayerEditor/> 2020-02-02 08:05:01 +00:00
orangemug 8ed67e98ce Fixed lint errors 2020-02-02 07:44:20 +00:00
orangemug 5792c632f9 hopefulMapStyle -> dirtyMapStyle 2020-02-01 17:55:26 +00:00
orangemug 3e2927e6a4 Fixed undo/redo 2020-02-01 17:53:01 +00:00
orangemug f09cc25a3b Merge remote-tracking branch 'upstream/master' into feature/ui-errors-and-expressions 2020-02-01 17:36:59 +00:00
orangemug c5c3e93aff Better support for expressions
- Expression editing state
 - CodeMirror JSON editor
 - Improved styling
2020-02-01 17:07:52 +00:00
Orange Mug cc371d6a70 Merge pull request #612 from orangemug/fix/color-field-name-is-not-required
'name' is not a required property of <ColorField />
2020-01-30 09:47:06 +00:00
Orange Mug 1b17e8fa0a Merge pull request #610 from orangemug/fix/issue-609
Fix for stuck/unchanging pop-up in Inspect view
2020-01-30 09:22:43 +00:00
Orange Mug bc4706de83 Merge pull request #607 from orangemug/fix/issue-567-better-solution-for-tooltips
Inline property documentation and SDK docs
2020-01-30 09:21:10 +00:00
orangemug 0f22eb83d3 'name' is not a required property of <ColorField /> 2020-01-30 09:18:23 +00:00
orangemug a8cbe19f09 Added style_renderer to field-spec-additional 2020-01-30 08:54:08 +00:00
orangemug c714e23d79 'id' is not guaranteed to be unique, see <https://github.com/maputnik/editor/pull/610/files#r372521304> 2020-01-30 08:46:26 +00:00
orangemug 5b3d579f87 Fix to fallback to index for unique feature key in <FeaturePropertyPopup /> 2020-01-29 08:44:27 +00:00
orangemug 725b752e35 Added initial expression work and UI errors. 2020-01-29 08:22:03 +00:00
orangemug 223721a65d Code review fixes
- Added docs to export modal
 - Fixed 'source type' doc in data sources modal
2020-01-27 08:49:44 +00:00
orangemug 9b4d924dff Fix to ignore modified styleSpec. 2020-01-24 17:46:43 +00:00
orangemug b31537e063 Added property values to docs 2020-01-24 09:04:32 +00:00
Orange Mug 63ed8c1de3 Merge pull request #605 from orangemug/maintenance/update-deps-2020-01-19
Updated deps
2020-01-23 08:50:01 +00:00
Orange Mug 7aa0298f7c Merge pull request #603 from orangemug/feature/add-image-and-video-sources
Added ability to add image/video sources
2020-01-23 08:49:37 +00:00
orangemug 62f3cbe8fb Lint fixes. 2020-01-23 08:42:20 +00:00
orangemug 30facc885f Tidy inline docs and added sdk support table. 2020-01-23 08:33:12 +00:00
orangemug 17aa88e3b6 Merge remote-tracking branch 'upstream/master' into fix/issue-567-better-solution-for-tooltips 2020-01-22 08:57:45 +00:00
Orange Mug 5b9af07ebc Merge pull request #604 from orangemug/feature/issue-82
Link to OSM from debug panel
2020-01-19 20:11:30 +00:00
orangemug 6b45dc8b4d Added style formatting into apistore 2020-01-19 20:05:11 +00:00
orangemug 0009c74948 Fixes lat/lon precision and center change via zoom without pan. 2020-01-19 19:09:04 +00:00
Orange Mug 8911f83ef3 Merge pull request #522 from orangemug/feature/add-range-slider
Add range input for minZoom/maxZoom
2020-01-19 18:54:07 +00:00
orangemug 2fafafe0dc Updated deps 2020-01-19 16:39:41 +00:00
orangemug 27e6675d26 Fix replacing of access tokens in MapboxGl. 2020-01-19 16:30:27 +00:00
orangemug 4269e4573c Fixed lint errors. 2020-01-19 16:00:29 +00:00
orangemug 096e2b6aec Fixed image/video coord labels. 2020-01-19 15:48:11 +00:00
orangemug 33e04b3527 Added ability to add/edit image and video sources 2020-01-19 14:40:35 +00:00
orangemug 79fa2b3508 Feature to update current map view in OSM 2020-01-19 13:37:56 +00:00
orangemug d5ef412300 Safari fixes. 2020-01-19 11:53:27 +00:00
orangemug 0726a494be Only set dirtyValue on valid change. 2020-01-19 11:41:37 +00:00
orangemug 926969b921 Always change via step from keyboard. 2020-01-19 11:28:03 +00:00
orangemug 59e070f463 Merge remote-tracking branch 'upstream/master' into feature/add-range-slider 2020-01-19 11:06:39 +00:00
orangemug 2ccd1d227e rangeValue -> dirtyValue 2020-01-19 11:06:24 +00:00
orangemug 655877f67e Fixed another bug with change events for <NumberInput/> and added range input keyboard support. Remove logging as react props/state is enough for debugging. 2020-01-19 10:30:08 +00:00
Orange Mug 6c240d53e4 Merge pull request #601 from orangemug/fix/issue-588
Added new fieldSpec.type 'resolvedImage'
2020-01-19 09:59:41 +00:00
Orange Mug f89f8ed4ea Merge pull request #587 from pathmapper/matchingbrackets_addon
Add matchbrackets addon to JSON editor
2020-01-19 09:48:08 +00:00
Orange Mug 6123b464de Merge pull request #600 from orangemug/fix/issue-589
Fix feature selection in <FeatureLayerPopup />
2020-01-19 09:46:57 +00:00
Orange Mug 49dba02e8f Merge branch 'master' into matchingbrackets_addon 2020-01-19 08:29:25 +00:00
pathmapper fb49a3abe5 Merge pull request #602 from orangemug/fix/issue-565
Update react-collapse
2020-01-19 08:54:28 +01:00
orangemug c88f9ab5dc Believed fix for race condition in setting dirtyValue 2020-01-19 07:37:49 +00:00
orangemug d886b14d09 Fix to set "editing: false" in blur/pointerup 2020-01-19 07:15:50 +00:00
orangemug bd1204a7a5 Added react-collapse transition, required for react-collapse@^5 2020-01-18 22:11:02 +00:00
orangemug 9cadda0236 Update react-collapse which was needlessly updating and causing scroll position jump. 2020-01-18 22:03:29 +00:00
orangemug 90ea6323c1 Added new fieldSpec.type 'resolvedImage' 2020-01-18 20:57:59 +00:00
orangemug 51f2cfac16 Fix feature selection in <FeatureLayerPopup /> 2020-01-18 20:42:38 +00:00
Orange Mug 4dbb423ac2 Merge pull request #599 from pathmapper/update_omt_styles
Update OMT styles for v3.11
2020-01-15 10:06:58 +00:00
Orange Mug a3ee1cc27e Merge pull request #595 from pathmapper/maxzoom
Increase maximum zoom level of the map to 24
2020-01-15 10:06:20 +00:00
pathmapper fea0798349 Update OMT styles for v3.11 2020-01-14 10:28:32 +01:00
pathmapper bd8abffa28 Merge pull request #597 from pathmapper/appveyor_vs_2019
Update appveyor to "Visual Studio 2019"
2020-01-13 09:39:48 +01:00
pathmapper a5f3a43cde Merge pull request #596 from pathmapper/remove_node_v8
Remove node v8 from test runners
2020-01-13 09:39:28 +01:00
pathmapper 6c5dc7e06b Update appveyor to "Visual Studio 2019" 2020-01-11 10:26:07 +01:00
pathmapper b1c8a12e88 Remove node v8 from appveyor 2020-01-11 09:39:09 +01:00
pathmapper 401c6971f4 Remove node v8 from circleci 2020-01-11 09:38:20 +01:00
pathmapper 7e5a5ce077 Set map maxZoom to 24 2020-01-10 14:06:17 +01:00
pathmapper 6b245c9894 Improve matchingbrackets and cursor visibility 2019-10-30 12:24:25 +01:00
pathmapper b963fe9619 Add matchbrackets addon 2019-10-29 10:52:06 +01:00
Orange Mug 673887d93b Merge pull request #582 from orangemug/fix/add-source-errors
Add open modal and source http/https errors
2019-10-28 18:19:21 +00:00
Orange Mug 06898429fd Merge pull request #584 from orangemug/fix/issue-576
A hack fix for blocked popup
2019-10-28 18:18:33 +00:00
pathmapper 0196ba4eb4 Merge pull request #585 from orangemug/fix/issue-403
Update map style even if inspectModeEnabled=true
2019-10-28 06:38:49 +01:00
orangemug ef81534a17 Update map style even if inspectModeEnabled=true 2019-10-27 20:04:57 +00:00
orangemug a958ec943b Lint fix. 2019-10-27 19:16:13 +00:00
orangemug 4e3b395b3d A hack fix for blocked popup. 2019-10-27 19:11:34 +00:00
Orange Mug 5e7fd4f93c Update src/components/inputs/UrlInput.jsx
CORs -> CORS

Co-Authored-By: pathmapper <pathmapper@posteo.de>
2019-10-27 19:07:49 +00:00
orangemug 25cad5bb25 Added to GeoJSON url. 2019-10-27 18:58:22 +00:00
orangemug f9c230414e Fix width of modal. 2019-10-27 18:54:40 +00:00
orangemug 866f8d034a Switched to <UrlInput/> for glyphs and sprites 2019-10-27 18:45:49 +00:00
pathmapper be6aa559fb Merge pull request #583 from orangemug/feature/make-osm-liberty-the-default
Make osm-liberty the default style
2019-10-27 19:38:11 +01:00
orangemug a560176d83 Add even more logging. 2019-10-27 18:15:54 +00:00
Orange Mug 4644e78fd2 Merge pull request #579 from orangemug/fix/function-field-fixes
Function field fixes
2019-10-27 17:58:06 +00:00
orangemug 237cc16b97 Make osm-liberty the default style. 2019-10-27 17:46:34 +00:00
orangemug dffa54afb0 Removed more old styleUrlElement refs 2019-10-27 17:42:45 +00:00
orangemug 225e5c48e4 Fixed lint error. 2019-10-27 17:38:57 +00:00
orangemug 2e017d252a Added <UrlInput/> to open modal. 2019-10-27 17:36:20 +00:00
orangemug e728e5f7e4 Exposed onInput in <UrlInput/> 2019-10-27 17:35:56 +00:00
orangemug f0371b41b1 Also validate on constructor 2019-10-27 17:27:50 +00:00
orangemug a51442921a Fix font-size inline with the rest of the UI. 2019-10-27 17:19:03 +00:00
orangemug f39fb34f36 Protocol logic and lint fixes. 2019-10-27 17:15:17 +00:00
orangemug 566201fb45 Added UrlInput component to tidy things up a little. 2019-10-27 17:08:23 +00:00
orangemug 88841b56e7 Added another fix attempt and yet more logging. 2019-10-27 15:56:22 +00:00
orangemug 5aa0b4e7d9 More logging additional attempt at fixes. 2019-10-27 11:01:33 +00:00
Orange Mug f19fc4a8a1 Merge pull request #581 from orangemug/fix/issue-535-data-field-ordering
Fix zoom ordering for data property fields
2019-10-27 10:18:34 +00:00
orangemug cd162309a8 Added hopeful fix + logging. 2019-10-27 10:15:11 +00:00
orangemug aead867e27 Incorrectly checking for falsey when should be checking for presence. 2019-10-27 10:05:05 +00:00
orangemug 663f295623 Added default protocol and stub in error. 2019-10-27 10:00:22 +00:00
orangemug c588164190 console.log map errors. 2019-10-26 18:27:11 +01:00
orangemug d61d0a5795 Fix test for range slider. 2019-10-26 18:09:07 +01:00
orangemug dddd604f7b Removed left over conflict markers and set default. 2019-10-26 17:41:56 +01:00
orangemug ea3b9a20c5 Merge remote-tracking branch 'upstream/master' into feature/add-range-slider 2019-10-26 17:22:52 +01:00
Orange Mug 7415b8af08 Merge pull request #580 from pathmapper/update_mb_deps
Update mbgl and style-spec
2019-10-26 17:19:04 +01:00
orangemug d06e053d34 Fix zoom ordering for data property fields. 2019-10-26 17:15:25 +01:00
pathmapper 7075a8b05e Update mbgl and style-spec 2019-10-26 07:10:30 +02:00
orangemug 4cbcf14588 Make up defaults from function field if we can't find one from the spec. 2019-10-25 22:54:08 +01:00
orangemug ca202d7701 Use <EnumInput/> for enums again 2019-10-25 22:48:37 +01:00
Orange Mug 8dfc16e7ee Merge pull request #577 from fredj/del_btn_style
Simplify and fix vertical alignment of the delete button
2019-10-25 22:15:23 +01:00
Frederic Junod fbf5cec670 Simplify and fix vertical alignment
Use the same css as the `maputnik-make-data-function` and `maputnik-make-zoom-function` buttons.
2019-10-25 13:16:09 +02:00
Orange Mug 14d4383f8a Merge pull request #575 from snodnipper/feature/zoomstack-v2
set OS Zoomstack endpoints to v2
2019-10-24 17:58:54 +01:00
Oliver Snowden 58bdd39f9e set OS Zoomstack endpoints to v2 2019-10-25 00:24:55 +08:00
Orange Mug ab9ab7acc7 Merge pull request #574 from fredj/GitHub_sponsor
Activate sponsor button in GitHub
2019-10-24 16:02:16 +01:00
Frederic Junod be39fd2ec8 Activate sponsor button in GitHub
See: https://help.github.com/en/github/building-a-strong-community/displaying-a-sponsor-button-in-your-repository
2019-10-24 16:51:45 +02:00
pathmapper 3c0185da27 Merge pull request #573 from pathmapper/node_13
Add node v13 to test runners
2019-10-24 05:59:12 +02:00
pathmapper b37b7276fb Add node v13 to test runners 2019-10-23 11:10:05 +02:00
Orange Mug c45cf2f0c8 Merge pull request #563 from orangemug/feature/more-root-property-support
Added support for more root level properties
2019-10-21 10:18:37 +01:00
Orange Mug 1f03fdbb50 Merge pull request #571 from orangemug/fix/map-perf-improvement
Remove shouldComponentUpdate from <MapboxGlMap/>
2019-10-20 12:50:33 +01:00
orangemug f3b8c5362a Remove shouldComponentUpdate because mapbox-gl will do the diff for us, so updates will no longer diff twice. 2019-10-20 12:25:43 +01:00
Orange Mug c9a5dd01be Merge pull request #570 from orangemug/feature/issue-559-add-raw-geojson-as-source
Add support for raw GeoJSON as source
2019-10-20 12:23:37 +01:00
orangemug 0fa4d40e92 Remove duplicate import rule. 2019-10-20 11:21:38 +01:00
orangemug 8a6e64c8c2 Merge remote-tracking branch 'upstream/master' into feature/issue-559-add-raw-geojson-as-source 2019-10-20 11:19:34 +01:00
orangemug 72b6dd1ae9 Fix lint errors. 2019-10-20 11:12:54 +01:00
orangemug ee525631fa Fixes for codemirror in sources modal
- Allows for max height
 - Override GeoJSON data when changing type
2019-10-20 11:09:20 +01:00
pathmapper ee9e055af3 Merge pull request #562 from orangemug/feature/json-editor-perf-improvements
react-codemirror2 -> codemirror directly
2019-10-19 21:56:59 +02:00
pathmapper b214c6ac7e Merge pull request #566 from orangemug/feature/add-profiling-build
Added profiling build to CI
2019-10-19 21:55:20 +02:00
orangemug eb75020861 Merge branch 'feature/json-editor-perf-improvements' into fix/issue-567-better-solution-for-tooltips 2019-10-19 16:56:45 +01:00
orangemug a44e757e31 Initial work for new help text implementation. 2019-10-19 14:43:27 +01:00
orangemug 9ac908948d Changed label/content styling for input blocks. 2019-10-19 13:12:09 +01:00
orangemug 19e82e5890 Added support for raw GeoJSON 2019-10-19 13:11:29 +01:00
orangemug bf84fd24ee Moved profiling to wdio-steps 2019-10-19 12:33:54 +01:00
orangemug affeb7c751 Fixed lint errors. 2019-10-19 12:21:38 +01:00
orangemug 9743361e0d Added back in 'light position' and 'center' with fixes for <ArrayInput/>
This also improves the usage of *-translate which uses the <ArrayInput/>
2019-10-19 12:16:56 +01:00
orangemug ab16120af2 Added invalid style to inputs 2019-10-19 12:07:08 +01:00
orangemug 37e5ba0fff Remove 'center' and 'light position', as they weren't working properly. 2019-10-16 22:36:41 +01:00
orangemug 0aa0dad7fb Remove undefined root properties. 2019-10-16 22:31:29 +01:00
orangemug 2910efde6e Allow removal of light/transition properties. 2019-10-16 21:58:24 +01:00
orangemug eac7656786 <NumberInput/> unsetting fix. 2019-10-16 21:57:29 +01:00
Orange Mug be3175beae Merge pull request #569 from fredj/layer-type-test-issue
Fix the layer type test in LayerEditor component
2019-10-16 19:21:03 +01:00
Frederic Junod 26de95a263 Fix the layer type test in LayerEditor component
`LayerSourceLayerBlock` was always included
2019-10-16 15:36:25 +02:00
orangemug d0a47bd122 Added support for transition root property 2019-10-16 10:15:46 +01:00
orangemug 8c760bb810 Added default support to <EnumInput/> 2019-10-16 10:12:59 +01:00
orangemug c27deefdef Added profiling build to CI 2019-10-16 09:56:26 +01:00
orangemug 392a845460 Moved "Style Renderer" options to bottom of list. 2019-10-16 08:24:25 +01:00
orangemug e7622c2080 Added root level light property support. 2019-10-16 08:17:25 +01:00
orangemug 3a558412ba Merge remote-tracking branch 'upstream/master' into feature/added-light-property-support 2019-10-16 08:16:28 +01:00
Orange Mug 95e205943a Merge pull request #564 from orangemug/fix/typo-in-export
Fixed typo in export
2019-10-16 08:14:21 +01:00
orangemug eb8686325c Fixed typo in export. 2019-10-16 08:13:37 +01:00
orangemug 1f77e156e6 Added support for root level properties
- center
 - zoom
 - bearing
 - pitch
2019-10-16 07:38:50 +01:00
orangemug 92ee50a4a4 Added default support to <ArrayInput/> 2019-10-16 07:36:30 +01:00
orangemug ef23f01e67 Removed react-codemirror2 as we no longer use it 2019-10-16 06:49:11 +01:00
orangemug 22b6a4a2bf Added max-width to allow overfow scroll on JSONEditor 2019-10-16 06:46:30 +01:00
Orange Mug 201ecac156 Merge pull request #561 from fredj/ol_attribution_color
Set a color for the OpenLayers attribution control
2019-10-15 17:37:47 +01:00
orangemug 563a78ed42 Moved away from react-codemirror2 to interacting with codemirror directly. 2019-10-15 17:34:36 +01:00
Frederic Junod 47acc2640b Set a color for the OpenLayers attribution control 2019-10-15 14:37:04 +02:00
Orange Mug f088788246 Merge pull request #557 from orangemug/feature/perf-improvements
LayerList performance improvements
2019-10-15 09:35:56 +01:00
Orange Mug e219dcd332 Merge pull request #556 from orangemug/feature/add-new-mgljs-features
Added new features from the mapbox-gl spec
2019-10-14 10:04:42 +01:00
orangemug b8829d9a5c Remove *-sort-key until we support expressions. 2019-10-14 09:22:21 +01:00
pathmapper 2c83c976c6 Merge pull request #558 from pathmapper/liberty_thumbnail
Update thumbnail source for OSM Liberty
2019-10-14 06:59:58 +02:00
orangemug d63782ddf2 Remove react warnings. 2019-10-13 18:03:58 +01:00
orangemug 3eabcbec72 Fix <NumberInput/> to allow for empty value (reset value) 2019-10-13 18:00:32 +01:00
orangemug 00ab303e44 Stop LayerEditor using same DOM elements for different layers. 2019-10-13 17:59:11 +01:00
pathmapper 38bf12701e Update thumbnail source for OSM Liberty 2019-10-13 17:30:43 +02:00
orangemug e4ec1d155a Added mapbox-gl features 'text-variable-anchor' and 'text-radial-offset' 2019-10-13 13:32:42 +01:00
orangemug 361f083687 Merge remote-tracking branch 'upstream/master' into feature/add-new-mgljs-features 2019-10-13 12:40:56 +01:00
orangemug c1a59200e2 1.6.1 2019-10-13 12:02:26 +01:00
orangemug 6e0432ff5e Added back in minifcation. 2019-10-13 11:43:23 +01:00
orangemug 1c83de08c1 Fixed lint errors. 2019-10-12 12:08:25 +01:00
orangemug 0af828543b Disable minify 2019-10-12 12:06:33 +01:00
Orange Mug 369cc23a30 Merge pull request #553 from orangemug/maintenance/update-deps-20191009
Update dependencies
2019-10-12 11:56:38 +01:00
orangemug db56ad8b2e Remove duplicate formatColor call. 2019-10-12 10:16:46 +01:00
orangemug 7fa17d81ac Some perf improvements when updating the layers list, also throttled color picker. 2019-10-12 10:10:33 +01:00
orangemug 019c6a0086 Merge remote-tracking branch 'origin/maintenance/update-deps-20191009' into maintenance/update-deps-20191009 2019-10-12 09:10:42 +01:00
orangemug c1bee74b57 Switched back from using yarn to npm for lockfiles. 2019-10-12 09:09:39 +01:00
Orange Mug b794279304 Bumped mapbox-gl to 1.4.1
Co-Authored-By: pathmapper <pathmapper@posteo.de>
2019-10-12 07:08:30 +01:00
Orange Mug 935dfa1704 Merge pull request #555 from pathmapper/update_omt_styles
Update OMT styles
2019-10-12 07:03:17 +01:00
pathmapper bda7a0e659 Update OMT styles 2019-10-11 16:13:08 +02:00
orangemug 8d1cc340b8 Added new features text-writing-mode and *-sort-key 2019-10-10 08:52:36 +01:00
orangemug 338c6b59a8 Lock deps in package.json 2019-10-09 22:06:59 +01:00
orangemug 021f8ab400 Update all the dependencies 2019-10-09 19:51:57 +01:00
Orange Mug f305db9e3e Merge pull request #551 from pathmapper/update_readme
Remove 1.6-beta from readme
2019-10-08 21:25:02 +01:00
pathmapper e916b25594 Remove 1.6-beta from readme 2019-10-08 21:59:34 +02:00
orangemug 5f1e212759 1.6.0 2019-10-08 18:28:56 +01:00
pathmapper 2b7db498ef Merge pull request #548 from pathmapper/popup_scroll
Make popups scrollable
2019-09-17 10:00:29 +02:00
pathmapper e6464790f6 Merge pull request #549 from pathmapper/beta_readme
Add 1.6.0-beta to readme
2019-08-22 10:55:31 +02:00
pathmapper 13ddf9f754 Link 1.6 beta from readme 2019-08-22 10:26:53 +02:00
pathmapper 30edb881ed Ensure popup is fully visible 2019-08-21 14:41:14 +02:00
pathmapper b30bbdc248 Calculate popup height depending on viewport 2019-08-10 10:37:39 +02:00
pathmapper 824616f6bd Make popups scrollable 2019-08-09 15:55:52 +02:00
Yuri Astrakhan 2a832955c4 Updated docs, rm creds 2019-08-03 15:02:16 -04:00
Yuri Astrakhan 608b836fe0 fix readme 2019-08-03 12:37:19 -04:00
Yuri Astrakhan de9c4fcc4a Optimize docker image
* Use 2 stage docker building to produce a tiny python3-slim based docker image with just the compilation results.
2019-08-03 12:08:54 -04:00
orangemug 109198a524 1.6.0-beta 2019-08-02 18:08:21 +02:00
pathmapper 920e4fe630 Merge pull request #545 from pathmapper/navcontrols
Fix css and increase color contrast for navcontrols
2019-08-01 14:21:51 +02:00
pathmapper 5e143e0a8e Fix css and increase color contrast 2019-08-01 13:59:34 +02:00
pathmapper 57f803d52c Merge pull request #544 from pathmapper/update_styles
Update available styles
2019-07-30 14:19:38 +02:00
pathmapper c55d342c7e Remove empty line 2019-07-30 13:58:18 +02:00
pathmapper e9065635cd Add toner and move empty style 2019-07-30 13:51:05 +02:00
pathmapper 6057721249 Merge pull request #543 from pathmapper/update_mb_dependencies
Update mapbox dependencies to current version
2019-07-30 10:51:04 +02:00
pathmapper 975487d271 Use visualizePitch option 2019-07-30 08:10:56 +02:00
pathmapper 46b2fd5978 Update mapbox dependencies to current version 2019-07-30 06:45:21 +02:00
pathmapper f61313449f Merge pull request #542 from pathmapper/update_maptiler_key
Update Maptiler key
2019-07-29 20:35:07 +02:00
pathmapper 366ad4d7df Update Maptiler key
Provided by @klokan via e-mail
2019-07-29 18:21:42 +02:00
pathmapper b5cfb44cf0 Merge pull request #512 from JesseCrocker/local-port
Add support for connecting to a local server on port other than 8000
2019-07-29 17:16:36 +02:00
pathmapper 050cc9cea9 Merge pull request #539 from pathmapper/update_mbgl
Update mapbox-gl and style spec to latest release
2019-07-17 09:41:58 +02:00
pathmapper b2f194eeee Update mapbox-gl to 1.1.1 2019-07-17 09:18:47 +02:00
pathmapper 97b0b8541d Update mapbox-gl and style spec 2019-07-02 11:04:44 +02:00
Orange Mug b5eb74fe20 Merge pull request #532 from pathmapper/fix_issue_471
Remove UNSAFE_componentWillUpdate
2019-06-28 16:42:08 +01:00
pathmapper 0500172d42 Update layer types 2019-06-23 09:55:32 +02:00
pathmapper 0e7bd98485 Use componentDidUpdate 2019-06-23 09:53:52 +02:00
Orange Mug ff0ece5149 Merge pull request #531 from orangemug/fix/issue-509
Ability to delete properties completely
2019-06-21 17:42:09 +01:00
orangemug db9ad86ac2 Filter empty strings in <FontInput/> 2019-06-21 08:05:09 +01:00
orangemug a066710bfb Always put an empty field and the end of the FontInput and remove blank fields if empty 2019-06-21 07:58:43 +01:00
orangemug 52740483b6 Merge remote-tracking branch 'upstream/master' into fix/issue-509 2019-06-20 20:40:22 +01:00
orangemug 518a624e20 Updated to mapbox-gl 1.1.0-beta.1 2019-06-20 20:37:26 +01:00
pathmapper 4ba71c8bd5 Remove UNSAFE_componentWillUpdate 2019-06-20 09:52:54 +02:00
orangemug ceeb628784 Added ability to delete color value. 2019-06-19 20:44:27 +01:00
orangemug 2ec6a90dc3 Allow removal of properties. 2019-06-19 20:34:28 +01:00
Orange Mug 4e37d834ed Merge pull request #530 from pathmapper/remove_node11
Remove node v11 from test runners
2019-06-17 09:03:28 +01:00
pathmapper a7922d894d Remove node v11 from test runners 2019-06-17 09:05:39 +02:00
pathmapper eeda3296ab Merge pull request #514 from pathmapper/node_v12_test_runners
Add node v12 to test runners
2019-06-17 06:49:30 +02:00
pathmapper acd26e0162 Update only if wanted version is not available 2019-06-16 22:03:37 +02:00
pathmapper fbf828e202 Merge branch 'master' into node_v12_test_runners 2019-06-16 21:21:33 +02:00
pathmapper af9015f529 Merge pull request #526 from pathmapper/update_wdio
Update WebdriverIO to v5
2019-06-16 11:53:09 +02:00
Orange Mug 7a172b2022 Merge pull request #528 from pathmapper/renderer_metadata
Set default renderer if undefined
2019-06-16 10:03:37 +01:00
pathmapper a609dc4029 Set default renderer if undefined 2019-06-16 05:27:53 +02:00
pathmapper 92bfee4bcc Use number input again for min/max-zoom tests 2019-06-13 07:18:35 +02:00
pathmapper 559d4618d1 Update wdio dependencies 2019-06-13 07:05:02 +02:00
pathmapper 5c391ee287 Update selenium-standalone used for testing and move wdio-steps to node active LTS 2019-06-08 18:34:03 +02:00
pathmapper db74cfeb2a Update express and is-docker dependencies 2019-06-08 18:10:54 +02:00
pathmapper 726b825e4c Update mocha dependency 2019-06-08 17:55:08 +02:00
pathmapper 84d56b2606 Skip "upload" test for the open modal 2019-06-08 17:16:51 +02:00
pathmapper e9a8b094a2 Update tests for WebdriverIO v5 2019-06-08 07:19:18 +02:00
pathmapper 924b14621a Update wdio.conf.js 2019-06-08 07:04:41 +02:00
pathmapper b072e3a98c Update wdio and selenium dependencies 2019-06-08 06:59:47 +02:00
Orange Mug 827bd5fa24 Merge pull request #524 from orangemug/feature/ol-improvements
Further OpenLayers improvements
2019-06-01 17:39:40 +01:00
orangemug 9e0410afe6 Fix to reset map state on renderer change. 2019-06-01 08:28:22 +01:00
orangemug ef08a9347e Disable debugToolbox by default. 2019-05-29 19:18:24 +01:00
orangemug 9b732540a6 Remove commented out code. 2019-05-29 19:16:17 +01:00
orangemug 24c52074b8 Fixed lint errors. 2019-05-29 18:59:26 +01:00
orangemug cb6c6e0d9f Remove projection code for now. 2019-05-29 18:54:32 +01:00
orangemug 884dc6fa49 Fixed typos. 2019-05-29 18:28:47 +01:00
orangemug efe42021f1 Some more openlayers improvments as well as initial work for projection support 2019-05-29 17:37:55 +01:00
pathmapper 470277c253 Merge pull request #523 from orangemug/feature/update-ol-plus-stability-fixes
Update openlayers + stability fixes
2019-05-22 09:47:13 +02:00
orangemug c1cab38c7a Merge remote-tracking branch 'upstream/master' into feature/update-ol-plus-stability-fixes 2019-05-22 07:51:13 +01:00
orangemug 1cf36ddb08 Updated ol-mapbox-style/ol, added throttle to ol map update and fix to clear layers. 2019-05-22 07:32:06 +01:00
orangemug 1fec89b69e Moved back to data-wd-key approach and fixed tests 2019-05-21 19:07:28 +01:00
orangemug 911549aca3 Moved data-wd-key onto element 2019-05-21 18:54:09 +01:00
orangemug 41329ec2f8 Fixes for firefox, this makes the range input only update on pointerup 2019-05-21 18:42:19 +01:00
orangemug 15cdfbc980 Changed default of step 0.01 -> 1 2019-05-20 11:28:27 +01:00
orangemug 5053058c32 Fixed default values for range slider. 2019-05-20 11:21:23 +01:00
orangemug 8a8cfad303 Merge remote-tracking branch 'upstream/master' into feature/add-range-slider 2019-05-20 10:20:55 +01:00
Orange Mug cc3c17078d Merge pull request #517 from orangemug/fix/editing-of-number-and-string-inputs
Fix for string/number inputs when inputting invalid of intermediate values
2019-05-20 10:15:25 +01:00
pathmapper 47965d5f57 Merge pull request #518 from orangemug/fix/color-accessibility-ua-switch
Toggle color accessibility based on user agent
2019-05-19 19:58:42 +02:00
Orange Mug c947d9e3ed Merge pull request #516 from orangemug/fix/prevent-default-browser-undo-redo
Prevent native browser undo/redo when handled by app
2019-05-19 18:52:14 +01:00
Orange Mug 8318180e96 Merge pull request #519 from orangemug/feature/debug-modal
Added semi-hidden debug modal
2019-05-19 18:51:43 +01:00
orangemug 87daf6fb76 Fixes because I was incorrectly assuming mgljs only 2019-05-19 10:09:44 +01:00
pathmapper 5d254ac2ff Merge pull request #520 from orangemug/fix/color-filters-with-ol
Layout issues in accessibility color filters with the openlayers renderer
2019-05-19 10:04:16 +02:00
orangemug 482f322d9f Fixed layout issues in accessibilty color filters with the openlayers renderer
Also updated ol & ol-mapbox-style
2019-05-19 06:25:28 +01:00
orangemug b1d097a40f Merge remote-tracking branch 'upstream/master' into feature/add-range-slider 2019-05-19 06:04:21 +01:00
Orange Mug da456b08fe Merge pull request #444 from orangemug/feature/issue-433
Added color swatch to <FeatureLayerPopup/>
2019-05-18 19:15:27 +01:00
orangemug 2776ac3ce0 Added back in onOpenToggle 2019-05-18 19:06:54 +01:00
orangemug eb2fc4c715 Fixed prop-type name. 2019-05-18 19:02:51 +01:00
orangemug d2ffc3a0b1 Added semi-hidden debug modal and removed all this url param awkwardness 2019-05-18 18:54:10 +01:00
orangemug 40a9978f31 Removed console.log 2019-05-18 18:23:02 +01:00
orangemug 22688933b3 Toggle color accessibility based on user agent
It's only supported in chrome and firefox and we can't feature detect this.
2019-05-18 18:19:23 +01:00
orangemug 7cf01f0c12 Merge remote-tracking branch 'upstream/master' into feature/issue-433 2019-05-18 17:33:31 +01:00
orangemug 1e87765f95 Tidy and added fallback (exception) color. 2019-05-18 17:29:59 +01:00
orangemug cc8fe4e02e Fix for buggy string/number inputs when inputting invalid of intermediate values 2019-05-18 15:56:14 +01:00
orangemug 979fc98e70 Prevent native browser undo/redo when handled by app 2019-05-18 15:47:51 +01:00
pathmapper c3c0c35d8a Merge pull request #513 from pathmapper/update_readme
Update readme
2019-05-05 15:13:47 +02:00
pathmapper f9913cad63 Use jsDelivr for Maputnik logo and sponsor images
To make them appear on https://hub.docker.com/r/maputnik/editor/.
2019-05-05 09:14:11 +02:00
pathmapper 0ed64f94e8 Fix link devDependencies 2019-05-05 08:58:34 +02:00
pathmapper 1deecd4e2a Update node-sass 2019-05-05 08:48:25 +02:00
pathmapper e0e9201b46 Add node v12 to appveyor 2019-05-05 07:57:41 +02:00
pathmapper 362c7b437e Add node v12 to circleci 2019-05-05 07:47:50 +02:00
Jesse Crocker efd0b547e9 Fix this being undefined 2019-04-16 09:19:36 -06:00
Jesse Crocker afbaaa66bc Add support for using a port other than 8000 2019-04-16 08:23:21 -06:00
pathmapper de8c687dfb Merge pull request #483 from sk1p/popup-cleanup
Various cleanups regarding popups and inspect mode
2019-04-16 07:29:19 +02:00
pathmapper 1bb079f078 Merge pull request #501 from pathmapper/issue_484
Fix JSON-editor
2019-04-16 07:05:43 +02:00
pathmapper b35322522f Merge pull request #499 from pathmapper/scrollbar-ff
Firefox scrollbar styling
2019-04-15 07:48:15 +02:00
pathmapper 6a605571e0 Firefox scrollbar styling 2019-04-15 07:14:10 +02:00
pathmapper c4ec77c911 Merge pull request #511 from pathmapper/update_stylelint
Update stylelint and remove node 6 from test-runners
2019-04-15 06:39:26 +02:00
pathmapper f7643cee7e Fix appveyor lint-styles 2019-04-14 10:05:15 +02:00
pathmapper cd95202dcc Update stylelint and remove node 6 from test-runners 2019-04-14 09:35:58 +02:00
pathmapper facba3998b Merge pull request #510 from lukaswelte/master
Update mapbox dependencies to current version
2019-04-11 09:24:54 +02:00
Lukas Welte 1f9cc2ce33 Update mapbox dependencies to current version 2019-04-10 14:09:44 +02:00
pathmapper ad505378ab Merge pull request #508 from pathmapper/master
Change Maptiler URLs
2019-04-08 10:13:16 +02:00
pathmapper fb7b30c81d Add backwards compability for tilehosting URLs 2019-04-06 12:00:48 +02:00
pathmapper cb3f93c67d Change Maptiler URLs 2019-04-03 09:51:43 +02:00
pathmapper 76cb5a6b7c Merge pull request #505 from maputnik/revert-504-readme_images
Revert "Readme: Use absolute URLs for logo and sponsor images"
2019-03-11 20:45:15 +01:00
pathmapper 990e47cb24 Revert "Readme: Use absolute URLs for logo and sponsor images" 2019-03-11 20:07:08 +01:00
pathmapper 8be7465428 Merge pull request #504 from pathmapper/readme_images
Use absolute URLs for logo and sponsor images
2019-03-11 19:31:14 +01:00
pathmapper e2b7a6a517 Use absolute URLs for logo and sponsor images 2019-03-11 14:47:47 +01:00
pathmapper 284e00b665 Merge pull request #500 from pathmapper/appveyor_lint-styles
Appveyor add again lint-styles
2019-03-11 10:26:31 +01:00
pathmapper 1fbfa8428b Remove unused argument 2019-03-07 13:47:53 +01:00
pathmapper b13b89c7ce Fix JSON-editor 2019-03-07 13:06:02 +01:00
pathmapper 3fa31e2a2e Merge pull request #485 from sk1p/icon-input-value-type
IconInput value type should be string, not array
2019-03-06 07:22:23 +01:00
pathmapper 0e7d2d8ff5 Appveyor lint-styles 2019-03-05 13:43:34 +01:00
pathmapper 2def3820dd Merge pull request #498 from pathmapper/node10-slim_for_docker
Use node:10-slim for Docker
2019-03-01 17:42:13 +01:00
pathmapper e1a489f318 Use node:10-slim for Docker 2019-02-27 13:50:27 +01:00
pathmapper 760839eb83 Merge pull request #497 from pathmapper/externally-accessible-dev-server
How to start externally accessible dev server
2019-02-15 19:51:30 +01:00
pathmapper 7136d2dea3 How to start externally accessible dev server 2019-02-15 19:25:14 +01:00
pathmapper 21f4d26b50 Merge pull request #482 from sk1p/type-formatted-hotfix
Use StringInput for 'formatted' field type
2019-02-11 12:50:38 +01:00
pathmapper 627ea268c9 Merge pull request #495 from maputnik/fix/popup-tip-border-color
Fix/popup tip border color
2019-02-10 19:09:24 +01:00
pathmapper 65f77db4d6 Merge pull request #494 from pathmapper/fix-docker
Fix Docker
2019-02-10 10:11:12 +01:00
pathmapper 03b4f1eb8d Update Dockerfile 2019-02-10 07:58:37 +01:00
pathmapper 82d1fc0a8b Merge pull request #492 from pathmapper/pathmapper-readme-cli
Adding information regarding CLI
2019-02-09 14:36:38 +01:00
pathmapper 3b16de5df4 Adding information regarding CLI again 2019-02-09 14:15:23 +01:00
pathmapper 94d4070653 Merge pull request #490 from pathmapper/pathmapper-warning_docker
Dockerfile fix warning
2019-01-31 09:05:03 +01:00
pathmapper d856a1cd8e Dockerfile fix warning 2019-01-29 14:14:28 +01:00
pathmapper 7c1d0f7bee Merge pull request #480 from pathmapper/update_status_badge
Update status badge: travis -> circleci
2019-01-22 14:46:36 +01:00
pathmapper d02036321f Merge pull request #486 from fredj/spelling
Correct some spelling mistake in README
2019-01-22 14:44:45 +01:00
Frederic Junod 1edadcc6bb Correct some spelling mistake in README 2019-01-18 16:30:36 +01:00
Alexander Clausen aa92091d2d IconInput value type should be string, not array 2019-01-06 18:07:38 +01:00
Alexander Clausen 14e0385575 Reflect current view in dropdown
Useful if the view is toggled between inspect and map via keyboard
shortcut.
2019-01-06 06:20:03 +01:00
Alexander Clausen 6cf861d44e Keep inspect mode consistent across renderer changes
If you were in inspect mode, switched to open layers, and back to
MapboxGlMap, the state in MapboxGlMap and MapboxInspect diverged,
meaning MapboxGlMap thought it was in inspect mode, while MapboxInspect
had inspector mode disabled.
2019-01-06 06:02:10 +01:00
Alexander Clausen 1375240bfa For better debuggability, actually keep one popup node around 2019-01-06 06:01:04 +01:00
Alexander Clausen 8f391d7d52 Cleanup popup nodes
Before, the component instances used for rendering popup content were
kept around, slowly leaking memory. This could be observed using react
developer tools.
2019-01-06 05:49:03 +01:00
Alexander Clausen 84654e81af MapboxGlMap: remove unused state variables 2019-01-06 05:39:19 +01:00
Alexander Clausen 7ff0524bb7 Allow inspect mode to count properly
Example: https://maputnik.github.io/editor/#12.86/54.38618/9.76697
2019-01-06 05:35:43 +01:00
Alexander Clausen 06c3c92fd6 Ensure key uniqueness in FeaturePropertyPopup 2019-01-06 05:35:11 +01:00
Alexander Clausen 4c2941e9b6 Use StringInput for 'formatted' field type 2019-01-05 22:38:58 +01:00
pathmapper ed7a25646e Use master branch 2019-01-05 08:16:22 +01:00
pathmapper 8c821176cf Update status badge: travis -> circleci 2019-01-04 20:31:01 +01:00
Orange Mug 98ded98583 Merge pull request #476 from pathmapper/fix_issue_404
Use access token for fetchSources
2019-01-04 14:34:26 +00:00
Orange Mug 10ae69e41f Merge pull request #479 from maputnik/revert-465-source_layer_list
Revert "Use replaceAccessTokens in onStyleChanged"
2019-01-04 14:33:35 +00:00
Orange Mug 04531b4305 Revert "Use replaceAccessTokens in onStyleChanged" 2019-01-04 14:32:41 +00:00
Orange Mug 7ab4b2481c Merge pull request #477 from pathmapper/update_OMT_styles
Update OMT styles for v3.9
2019-01-04 14:31:37 +00:00
Orange Mug 6fa88e6869 Merge pull request #468 from meetar/shouldComponentUpdate-patch
shouldComponentUpdate hack
2019-01-04 14:31:14 +00:00
Orange Mug 5b90c31645 Merge pull request #465 from pathmapper/source_layer_list
Use replaceAccessTokens in onStyleChanged
2019-01-04 14:29:55 +00:00
pathmapper 5eba11faee Update OMT styles for v3.9 2018-12-19 10:57:06 +01:00
pathmapper 54b4fc473c Use access token for fetchSources 2018-11-27 13:51:26 +01:00
Orange Mug fe8595cdc9 Merge pull request #474 from pathmapper/empty_style
Update empty-style URL
2018-11-26 10:48:07 +00:00
Orange Mug 2565a89474 Merge pull request #475 from pathmapper/rtl_blob
Set MIME type for RTL blob
2018-11-26 10:47:42 +00:00
pathmapper 92b970377d Set MIME type for RTL blob 2018-11-25 08:13:21 +01:00
pathmapper dd3a550ec3 Update empty-style URL 2018-11-24 20:15:05 +01:00
Orange Mug 7d5d9e2d82 Merge pull request #470 from pathmapper/node_v11
Add node v11 to test runners and fix Appveyor
2018-11-19 11:42:52 +00:00
pathmapper 9daa71befc Bump node-sass 2018-11-18 19:23:06 +01:00
pathmapper f10a2d28df Use Visual Studio 2015 for Appveyor 2018-11-18 11:05:29 +01:00
Orange Mug d52c6c70bb Merge pull request #469 from morlay/master
make docker simpler
2018-11-17 15:34:18 +00:00
Orange Mug 6e2f46a0da Merge pull request #464 from pathmapper/fix-wobbling
Fix layer list wobbling
2018-11-17 15:18:41 +00:00
Orange Mug 2d6f91d0cd Merge pull request #447 from orangemug/fix/lock-logo-size-in-survey-popup
Fix the size of the logo in the survey modal
2018-11-17 15:17:51 +00:00
pathmapper f409079d93 Bump wdio-mocha-framework 2018-11-17 13:48:17 +01:00
pathmapper 7004259867 Use previous VS image 2018-11-17 12:19:15 +01:00
pathmapper f3128cb6d2 Add node v11 to test runners 2018-11-17 11:08:55 +01:00
Morlay 1dfd4d8d48 make docker simpler 2018-11-14 14:48:08 +08:00
Peter Richardson 2f30eb6cbe rm build 2018-11-12 20:50:20 -08:00
Peter Richardson cf45c04069 add shouldComponentUpdate
checks for differences in props and state - addresses https://github.com/maputnik/editor/issues/467
2018-11-12 20:47:24 -08:00
Peter Richardson 05d149bcfa added build 2018-11-12 16:35:18 -08:00
pathmapper 3acbc3291c Remove duplicated line 2018-11-05 21:08:34 +01:00
pathmapper 24aa2fd5fa Use replaceAccessToken onStyleChanged 2018-11-05 08:17:21 +01:00
pathmapper cc7d7a56f5 Fix wobbling 2018-11-04 10:38:58 +01:00
Orange Mug da17646b8d Merge pull request #463 from pathmapper/color-contrast
Increase color contrast (fixes #318)
2018-11-04 09:08:30 +00:00
pathmapper f9233a1e31 Increase color contrast 2018-11-03 18:01:34 +01:00
Orange Mug c94f536e5a Merge pull request #459 from orangemug/feature/layer-list-ui-handle
Make whole layer label draggable
2018-11-02 20:48:14 +00:00
orangemug b712e7f184 Merge remote-tracking branch 'upstream/master' into feature/layer-list-ui-handle
Conflicts:
	src/styles/_layer.scss
2018-11-02 17:57:42 +00:00
Orange Mug b8ab802de5 Merge pull request #461 from pathmapper/helper
Style layer which is dragged
2018-11-02 17:55:44 +00:00
pathmapper a74eb2989c Add helper class and style the helper 2018-11-02 14:25:31 +01:00
orangemug 3a0fc6eeac Fixed typo 2018-11-02 08:54:20 +00:00
Orange Mug 0f0684e701 Merge pull request #458 from pathmapper/debug
Add 'show-overdraw-inspector' query parameter
2018-11-02 08:50:20 +00:00
orangemug e9b5bfb572 Remove old code. 2018-11-02 08:34:56 +00:00
orangemug b456b59c44 Fix to allow high precision on text input and integer on range. 2018-11-02 08:28:51 +00:00
pathmapper 59ad91fdf8 Add 'show-overdraw-inspector' query parameter 2018-11-02 09:07:01 +01:00
orangemug e18d304313 Changed min/max zoom range step from 0.1 -> 1 2018-11-01 18:28:58 +00:00
orangemug 5de5281b49 Prevent title resize. 2018-11-01 18:26:21 +00:00
orangemug fe0df2a4ef Make range step configurable 2018-11-01 08:28:49 +00:00
orangemug deec7894dd Make the whole layer label draggable 2018-11-01 08:12:40 +00:00
Orange Mug c9a0c0400e Merge pull request #455 from pathmapper/autocomplete_z-index
Add z-index to autocomplete
2018-10-31 18:21:15 +00:00
pathmapper 419e62f69b Add z-index to autocomplete 2018-10-31 18:53:15 +01:00
Orange Mug 9ffbe3a7a2 Merge pull request #453 from orangemug/fix/more-menu-icon-size
Increase more-menu icon size, broken by react-icons update
2018-10-31 13:44:48 +00:00
orangemug c8e548e3be Increase more-menu icon size, broken by react-icons update 2018-10-31 08:19:12 +00:00
Orange Mug b9160bd333 Merge pull request #451 from pathmapper/firefox_select
Improve select styling
2018-10-31 08:05:22 +00:00
Orange Mug 8ad8b4cdea Merge pull request #450 from pathmapper/activate_renderer-test
Update tests for style settings modal
2018-10-31 08:03:18 +00:00
Orange Mug c51c40a20e Merge pull request #448 from orangemug/fix/shortcut-fixes
Shortcut fixes
2018-10-31 08:02:13 +00:00
Orange Mug 2ccb1a8e0a Merge pull request #446 from pathmapper/fix-445
Remove node v9 from appveyor and update readme
2018-10-31 08:00:48 +00:00
pathmapper 008bb75c04 Remove border for select select 2018-10-30 22:12:52 +01:00
orangemug a51fdb8435 Merge remote-tracking branch 'upstream/master' into feature/add-range-slider 2018-10-30 20:35:55 +00:00
orangemug cdd5d27908 Added range slider to <NumberInput /> 2018-10-30 20:35:22 +00:00
orangemug 82d3c934c8 Merge remote-tracking branch 'upstream/master' into fix/lock-logo-size-in-survey-popup 2018-10-30 20:26:17 +00:00
orangemug f2f0270936 Use KeyboardEvent.key rather than keyCode in attempt to support more keyboard layouts. 2018-10-30 20:12:48 +00:00
pathmapper 00f646d489 Update test runners and readme 2018-10-30 21:08:42 +01:00
Orange Mug 90a02df45c Merge pull request #449 from orangemug/fix/popup-tip-border-color
Fixes for 'mapboxgl-popup-tip' border color.
2018-10-30 19:57:52 +00:00
Orange Mug ad40a15a77 Merge pull request #443 from pathmapper/style-parameter
Warning when style parameter is used
2018-10-30 19:50:26 +00:00
Orange Mug d6809cb504 Merge pull request #409 from orangemug/fix/color-accessibility-styling-issue
Added hacks to fix styling issue
2018-10-30 19:46:41 +00:00
pathmapper ff8d3055b4 Add test for TF access token 2018-10-30 20:37:56 +01:00
orangemug 1f81449e3c Added a visible drag handle. 2018-10-30 19:32:20 +00:00
pathmapper c59e0cb046 Activate renderer test 2018-10-30 20:06:52 +01:00
pathmapper 2d1675c181 Fixes for code review comments 2018-10-29 17:35:12 +01:00
orangemug 48ebca6236 Fix the size of the logo in the survey modal so it doesn't cause a visual jump when it loads. 2018-10-29 13:12:01 +00:00
orangemug bce8e8b807 Shortcut fixes
- Allow shortcuts to trigger from the shortcut modal
 - Fix inspect/map toggle shortcut
2018-10-29 13:07:49 +00:00
pathmapper 1f4dfa7603 Update readme (Node versions and CLI) 2018-10-29 13:56:09 +01:00
pathmapper c23af0063d Add node v11 to the test runners 2018-10-29 13:42:01 +01:00
pathmapper 9f6250c489 Update tests 2018-10-29 11:16:27 +01:00
orangemug cf6c6f1c17 Fixes for 'mapboxgl-popup-tip' border color. 2018-10-27 14:41:50 +01:00
orangemug c6163b6ba2 Added missing css for popup changes 2018-10-27 14:14:20 +01:00
orangemug 7121a680b4 Add missing prop type 2018-10-27 14:08:23 +01:00
orangemug cf391031f0 Added color swatch to <FeatureLayerPopup/> 2018-10-27 14:04:13 +01:00
pathmapper 9cac5305cd Warning when style parameter is used 2018-10-25 19:37:39 +02:00
pathmapper b0adb8cd3d Remove style querystring parameter 2018-10-25 19:34:19 +02:00
Orange Mug 3d2a1d5d19 Merge pull request #439 from orangemug/feature/style-spec-additions
Style spec additions
2018-10-24 19:13:53 +01:00
Orange Mug 3c93c41de1 Merge pull request #442 from pathmapper/export-style-name
Use style name for export filename if available
2018-10-24 08:36:22 +01:00
Orange Mug 4baed5d8ab Merge pull request #441 from pathmapper/image_property
Move image property
2018-10-24 08:32:47 +01:00
pathmapper f17b02b1fe Slugify result in lower case 2018-10-23 13:31:38 +02:00
pathmapper 3c72d07a88 Export stylename if available 2018-10-23 13:04:23 +02:00
orangemug 7495c0dfcf Added support for 'fill-extrusion-vertical-gradient' and 'symbol-z-order'
Also updated @mapbox/mapbox-gl-style-spec
2018-10-22 22:29:23 +01:00
Orange Mug b0c877d4ae Merge pull request #418 from orangemug/fix/modal-exit-apply-changes
Delay modal close until blur events have triggered
2018-10-22 16:32:39 +01:00
Orange Mug e1fd0f8014 Merge pull request #438 from pathmapper/top_issues
Create .topissuesrc
2018-10-21 11:48:21 +01:00
pathmapper cb2198b661 Move image property 2018-10-21 11:28:05 +02:00
pathmapper 68beeeb599 Create .topissuesrc 2018-10-20 18:35:35 +02:00
orangemug 218ce148d5 Delay modal close until blur events have triggered. 2018-10-19 08:39:07 +01:00
Orange Mug d0cafb06ee Merge pull request #414 from pathmapper/osm-libety_gh-pages
Use GitHub Pages for OSM Liberty
2018-10-17 13:06:13 +01:00
Orange Mug 5671a58704 Merge pull request #415 from pathmapper/pathmapper-update_empty-style
Update Empty Style
2018-10-17 13:05:19 +01:00
pathmapper 9cf74ca405 Update empty-style.json 2018-10-17 13:16:10 +02:00
pathmapper 1c6e3648eb Use GitHub Pages for OSM Liberty 2018-10-16 07:32:25 +02:00
Orange Mug b3a4628a79 Merge pull request #413 from pathmapper/rawgit_shutdown
rawgit.com -> jsDelivr
2018-10-15 15:03:31 +01:00
pathmapper 941cc37c87 rawgit.com -> jsDelivr 2018-10-13 09:13:34 +02:00
Orange Mug 906d7ac3d5 Merge pull request #411 from orangemug/fix/autocomplete-only-autocomplete-strings
Stop autocomplete crashing the editor
2018-10-12 19:24:35 +01:00
orangemug 588b18d10e Only render strings in the autocomplete menu.
Expression objects were making there way into this menu which was crashing the editor.
2018-10-11 21:39:52 +01:00
Orange Mug 90024c5ec7 Merge pull request #408 from orangemug/maintenance/update-deps-2018-10-06
Updated dependencies
2018-10-10 15:15:26 +01:00
orangemug 889005de6c Set default value of autocomplete shouldItemRender value param as sometimes it's undefined 2018-10-09 21:11:47 +01:00
orangemug 843d3df8bc Fixed react-icons size/position. 2018-10-09 20:58:14 +01:00
orangemug 825b9044b9 Tidy naming. 2018-10-09 20:48:10 +01:00
orangemug 92a1be83b6 Moved babel config back out into .babelrc
This is due to .babelrc being used for other tooling.
2018-10-09 20:45:03 +01:00
orangemug 36e35eb208 Tidy webpack configs. 2018-10-09 20:43:35 +01:00
orangemug 2fcdb47fe5 Moved babel config, removed uglifyJs and decorators plugins 2018-10-09 20:14:16 +01:00
orangemug 012e4b670e Updated mapbox-gl and react-sortable-hoc usage 2018-10-08 09:32:21 +01:00
orangemug 492cc244d8 Added hacks to fix styling issue
See <https://github.com/maputnik/editor/pull/392#issuecomment-427595172>
2018-10-06 22:14:59 +01:00
orangemug d17d6b43c0 Fixed merge issue. 2018-10-06 21:57:24 +01:00
orangemug 1bf10cd6d6 Merge remote-tracking branch 'upstream/master' into maintenance/update-deps-2018-10-06
Conflicts:
	src/components/App.jsx
	src/components/Toolbar.jsx
2018-10-06 21:39:26 +01:00
orangemug b0cd9140be Updated remaining deps. 2018-10-06 21:21:42 +01:00
orangemug cc6196969f Updated lockfile 2018-10-06 21:07:48 +01:00
orangemug 802a7eb1be Updated babel/webpack 2018-10-06 21:05:33 +01:00
Orange Mug a666f86be0 Merge pull request #397 from orangemug/feature/ol-experimental-support
Added back in experimental OpenLayers support
2018-10-06 16:59:13 +01:00
Orange Mug 44fad76d45 Merge pull request #392 from orangemug/feature/color-accessibility-ui
Color accessibility UI
2018-10-06 16:58:32 +01:00
orangemug c8d23a534e Updated some dev deps 2018-10-06 16:44:23 +01:00
orangemug cf3650c8cd Updated react-icons 2018-10-06 16:38:08 +01:00
orangemug 1a8349f821 Updated deps with no API changes. 2018-10-06 16:01:34 +01:00
orangemug 855771a6b6 npm is getting confused about the lockfile. This now works locally from fresh install 2018-10-06 15:13:25 +01:00
orangemug b711168e44 Move package-lock.json fixes... :/ 2018-10-06 15:00:34 +01:00
orangemug 4134919dde Added missing key attribute to <option/> 2018-10-06 14:44:12 +01:00
orangemug 158153e366 Revert package-lock.json update and build against node:10 2018-10-06 14:42:33 +01:00
orangemug 6b890d162a Merge remote-tracking branch 'upstream/master' into feature/ol-experimental-support 2018-10-06 14:06:10 +01:00
orangemug 1525807d06 setValue -> selectByValue 2018-10-06 13:59:50 +01:00
orangemug a356bfd601 Switch from react-aria-menubutton to <select/> 2018-10-06 13:54:02 +01:00
Orange Mug e6d2a6d5ff Merge pull request #384 from orangemug/feature/os-open-zoomstack
OS Open Zoomstack
2018-10-06 13:25:23 +01:00
Orange Mug c8a004422f Merge pull request #406 from emuanalytics/bug/#380
Fix for Issue #380
2018-10-06 13:18:31 +01:00
Orange Mug df457fc7bf Merge pull request #407 from pathmapper/get-name
Get name from package.json
2018-10-04 18:15:42 +01:00
pathmapper 6e03f1f077 get name from package.json 2018-10-04 16:42:39 +02:00
Robin Summerhill 4c13350c14 Issue #380 - fix for data functions 2018-10-03 20:11:53 +01:00
Orange Mug 63a2495c68 Merge pull request #405 from pathmapper/update-tilehosting
Update tilehosting URL
2018-10-01 21:21:24 +01:00
pathmapper f9de73e18a Update tilehosting URL 2018-10-01 10:13:00 +02:00
Orange Mug e6e2be61f0 Merge pull request #398 from orangemug/fix/load-url-error
Show error if style fails to load and disabled button if input is empty
2018-09-26 18:35:51 +01:00
Gregory Wolanski 060f7aa42c Merge pull request #400 from orangemug/feature/make-layer-visibility-always-shown
Make layer visibility icon shown when hidden
2018-09-24 22:19:07 +02:00
orangemug 8b0ae178b8 Added in thumbnails 2018-09-24 21:17:41 +01:00
orangemug 6b94e9b78b Merge remote-tracking branch 'upstream/master' into feature/os-open-zoomstack
Conflicts:
	src/config/styles.json
2018-09-24 21:14:55 +01:00
orangemug b171bf3127 Fixes for code review comments. 2018-09-24 21:01:37 +01:00
orangemug 0c6a179cec Switch to using styleUrl for disabling button 2018-09-24 20:58:43 +01:00
Orange Mug aa50785c12 Merge pull request #399 from orangemug/fix/added-default-prop
Added default isActive prop to Collapse component
2018-09-24 20:44:04 +01:00
orangemug 252403b1e3 Added classBlockModifier to <LayerAction/> and switched to only displaying icons for hidden layers 2018-09-24 20:40:51 +01:00
orangemug bc1d0de057 Added default isActive prop to Collapse component 2018-09-24 16:55:53 +01:00
orangemug 4a0b9fd0de Added missing prop type 2018-09-24 15:13:35 +01:00
orangemug e8777e1857 Updated package-lock.json 2018-09-24 15:10:00 +01:00
orangemug 94a2a16330 Updated ol* versions 2018-09-24 14:51:25 +01:00
orangemug 004d135d93 Show error if style fails to load and disabled button if input is empty 2018-09-24 14:41:09 +01:00
orangemug 0973dcee8a Added back in experimental OpenLayers support 2018-09-24 14:05:53 +01:00
Orange Mug c908f7dcd0 Merge pull request #394 from orangemug/fix/request-abort-and-oerlapping-modals
Fix overlapping modals & request canceling
2018-09-23 22:28:39 +01:00
orangemug b7fd889fcd Removed signal from fetch as not supported in all browsers. 2018-09-23 21:00:17 +01:00
orangemug 35600c253d Revert react-aria-modal 2018-09-23 20:43:34 +01:00
orangemug 673465af77 Use AbortController in activeRequest 2018-09-23 19:53:32 +01:00
orangemug cc5d0dc4fe Merge remote-tracking branch 'upstream/master' into fix/request-abort-and-oerlapping-modals 2018-09-23 19:45:47 +01:00
orangemug e6da977c48 Prevented overlapping modals in react tree and fixed request canceling. 2018-09-23 19:40:50 +01:00
orangemug e4aa016713 Fixed lint errors 2018-09-23 14:50:29 +01:00
orangemug 8b67499a64 Removed external svg from filter command. 2018-09-23 14:48:19 +01:00
orangemug bcdc7c6811 Improved color accessibility UI 2018-09-23 14:39:02 +01:00
orangemug 8f07a79a49 Merge remote-tracking branch 'upstream/master' into feature/color-accessibility-ui
Conflicts:
	src/components/App.jsx
	src/styles/_components.scss
2018-09-23 11:39:15 +01:00
orangemug cdcf16196c Merge remote-tracking branch 'upstream/master' into feature/make-layer-visibility-always-shown
Conflicts:
	src/components/layers/LayerListItem.jsx
2018-09-23 09:07:02 +01:00
orangemug a0ed6a379b Always show layer visibility toggle in layer list 2018-09-23 09:05:08 +01:00
Orange Mug 7ffb44f604 Merge pull request #391 from orangemug/maintenance/remove-mapbox-for-now
Remove mapbox for the time being
2018-09-22 18:28:00 +01:00
Orange Mug 225d0388ce Merge pull request #386 from orangemug/fix/showTileBoundaries-error
Added guard to map object
2018-09-22 16:15:00 +01:00
Orange Mug 0468db8cc2 Merge pull request #390 from orangemug/fix/switch-visibility-icons
Switch visibility icons
2018-09-22 15:51:10 +01:00
Orange Mug 695f612110 Merge pull request #389 from orangemug/maintenance/remove-travis
Remove travis CI
2018-09-22 15:50:49 +01:00
Orange Mug 9c07852b87 Merge pull request #388 from orangemug/fix/glyph-key-replace
Fix glyph key replace
2018-09-22 15:50:12 +01:00
orangemug 9ef198fb86 Merge remote-tracking branch 'upstream/master' into maintenance/remove-mapbox-for-now 2018-09-22 14:19:44 +01:00
orangemug fd34e31462 Merge remote-tracking branch 'upstream/master' into fix/showTileBoundaries-error 2018-09-22 14:17:16 +01:00
orangemug 8eb49427fd Merge remote-tracking branch 'upstream/master' into fix/switch-visibility-icons 2018-09-22 14:15:43 +01:00
orangemug ebafb3c3dd Merge remote-tracking branch 'upstream/master' into maintenance/remove-travis 2018-09-22 14:14:12 +01:00
orangemug 09c6154949 Merge remote-tracking branch 'upstream/master' into fix/glyph-key-replace 2018-09-22 14:12:39 +01:00
Orange Mug 53c8661cd3 Merge pull request #358 from orangemug/fix/remove-componentWillUpdate
Remove UNSAFE_componentWillReceiveProps
2018-09-22 14:11:58 +01:00
orangemug 3d5eec897e Try moving to 'Visual Studio 2017' image 2018-09-22 13:44:41 +01:00
orangemug 3763ec3737 Remove mapbox until we have a valid access token. 2018-09-22 13:18:52 +01:00
orangemug f1216795d2 Swap layer visibility icons. 2018-09-22 13:12:36 +01:00
orangemug 0ac70df00f Remove travis as we now have CircleCI. 2018-09-22 13:06:56 +01:00
orangemug 7d0a985f1d Only replace glyphs key if a replacement exists. 2018-09-22 13:04:12 +01:00
orangemug c5ff67b6e0 Appveyor nodejs -v6 +v10 2018-09-22 12:50:40 +01:00
orangemug db6b9ac176 Added OS Open Zoomstack and styles 2018-09-20 19:26:53 +01:00
orangemug 77475af3c6 Added guard to map object 2018-09-20 19:16:23 +01:00
Orange Mug 805133d10c Merge pull request #383 from pathmapper/master
Access token labels OMT -> MapTiler
2018-09-15 10:03:21 +01:00
pathmapper fff8fb72c5 Access token labels OMT - MapTiler 2018-09-14 09:08:04 +02:00
Orange Mug e02b18cea3 Merge pull request #378 from pathmapper/patch-1
fix typo
2018-09-13 08:52:12 +01:00
pathmapper b8e9307ce2 fix typo 2018-09-11 13:52:39 +02:00
orangemug 00b22eb902 OpenLayers removed in previous PR. 2018-09-10 15:11:06 +01:00
orangemug be954143c3 Switch to setTimeout(fn, 0) 2018-09-10 15:09:34 +01:00
orangemug b314642586 Rollback to setImmediate 2018-09-10 14:55:45 +01:00
orangemug b5fc315b37 setImmediate -> process.nextTick 2018-09-10 14:51:22 +01:00
orangemug 26ff9f63bb Merge remote-tracking branch 'upstream/master' into fix/remove-componentWillUpdate
Conflicts:
	src/components/map/MapboxGlMap.jsx
	src/components/modals/ExportModal.jsx
2018-09-10 14:46:52 +01:00
Orange Mug 7e5fb4d42f Merge pull request #364 from orangemug/maintenance/reduce-bundle-size-v2
Reduce bundle size
2018-09-10 14:12:03 +01:00
Orange Mug 762bb786be Merge pull request #365 from orangemug/feature/added-no-webgl-error
Added no WebGL error message to MapboxGL map component
2018-09-10 14:09:09 +01:00
Orange Mug cec87765fc Merge pull request #366 from loicgasser/maintenance/transform-class-properties-and-arrow-func
Take advantage of transform-class-properties and use arrow functions
2018-09-10 14:08:46 +01:00
orangemug b966fae926 1.5.0 2018-09-10 13:18:21 +01:00
orangemug f1ddf4e57e 1.5.0-beta3 2018-09-03 21:17:50 +01:00
Orange Mug 64e65dc7d3 Merge pull request #377 from orangemug/fix/glyphs-for-tilehosting
Updated regex to tilehosting.com
2018-09-03 21:15:01 +01:00
orangemug 1e07a88aed Updated regex to tilehosting.com, partial revert of #367 2018-09-03 21:02:38 +01:00
orangemug 6e49cc65a9 1.5.0-beta2 2018-09-03 20:37:16 +01:00
Orange Mug 06d579118a Merge pull request #367 from loicgasser/bugfix/default-token
Fix glyph access key for openmaptiles
2018-09-03 20:34:01 +01:00
orangemug f0e4b5b930 1.5.0-beta 2018-09-01 11:09:19 +01:00
Loïc Gasser 088127a9a5 Fix glyph access key for openmaptiles 2018-08-27 16:18:43 -04:00
Loïc Gasser a4b4d077fa Fix .babelrc 2018-08-23 00:18:39 -04:00
Loïc Gasser bc2ec4d0b7 Remove unused imports 2018-08-23 00:18:39 -04:00
Loïc Gasser e4de101553 Take advantage of transform-class-properties and use arrow functions instead of bind 2018-08-23 00:18:37 -04:00
orangemug 6207416b32 Added no WebGL error message to MapboxGL map component 2018-08-22 22:05:46 +01:00
orangemug f0202241f4 Remove old base64 loader. 2018-08-22 18:51:58 +01:00
orangemug 0e8c94af1e Remove logging. 2018-08-22 18:51:42 +01:00
orangemug 922ee616ec Reduce bundle size
- Use the browsers fetch rather than the request module
 - base64-loader -> raw-loader
 - Remove ol3 because it's been broken for a while
 - Removed old GitHub gist support as it's no longer functional
 - Removed Mousetrap as we were only using a small part of the functionality
 - Moved to single js file to make things simplier
2018-08-22 09:36:34 +01:00
Orange Mug 98c235bc21 Merge pull request #363 from orangemug/feature/added-show-collision-boxes
Added 'show-collision-boxes' query parameter
2018-08-19 19:48:03 +01:00
orangemug 70f1f9ffac Added 'show-collision-boxes' query parameter 2018-08-19 17:32:18 +01:00
orangemug 409f81f0d8 More componentWillUpdate transition fixes. 2018-08-07 20:13:45 +01:00
orangemug 1aa90bef37 Removed componentWillUpdate 2018-08-06 22:27:03 +01:00
Orange Mug c5ea9494df Merge pull request #357 from chriswhong/356-zoom-button-fix
find correct zoom attribute in spec
2018-08-04 09:20:31 +01:00
Chris Whong 9a34db7008 find correct zoom attribute in spec 2018-08-03 15:25:05 -04:00
Orange Mug 988b7fca0f Merge pull request #355 from orangemug/fix/failing-tests
Disable survey in test runner
2018-08-01 22:14:36 +01:00
orangemug bdc6489db4 Disable survey in test runner, which was making the tests fail. 2018-08-01 20:59:42 +01:00
Orange Mug 49b096b601 Merge pull request #352 from orangemug/feature/add-thunderforest-source-v2
Added thunderforest source
2018-08-01 20:48:12 +01:00
Orange Mug 31d83f6a26 Merge pull request #354 from orangemug/maintenance/updated-mapbox-deps
Updated mapbox dependencies
2018-08-01 20:47:39 +01:00
orangemug 03e52b7a72 Added support for 'raster-resampling' 2018-08-01 20:34:26 +01:00
orangemug 551e950c39 Updated mapbox dependencies 2018-08-01 20:33:33 +01:00
orangemug a7620f83a6 Fixed broken token replacer function. 2018-07-28 16:36:01 +01:00
orangemug 0384181ee1 Added final bits for thunderforest integration 2018-07-27 16:25:53 +01:00
orangemug fd59f42819 Merge remote-tracking branch 'upstream/master' into feature/add-thunderforest-source
Conflicts:
	src/components/App.jsx
2018-07-27 15:43:02 +01:00
orangemug cc51774259 1.4.0 2018-07-27 13:19:14 +01:00
Orange Mug 5a19245ee0 Merge pull request #349 from orangemug/fix/react-codemirror-overflow
Fix to prevent contents of react-codemirror being hidden
2018-07-18 19:16:14 +01:00
orangemug 45f45b7547 Fix to prevent contents of react-codemirror being hidden 2018-07-18 08:07:35 +01:00
Orange Mug 530bfaf3b3 Merge pull request #348 from orangemug/fix/color-filter-undefined
Undefined filter fix (color accessibility)
2018-07-17 21:51:54 +01:00
orangemug 6ea70ab9cf Fix what I believe to be a 'first boot' error. 2018-07-17 20:45:12 +01:00
orangemug a0e2d68dae Only apply filter if defined. 2018-07-17 20:40:23 +01:00
Orange Mug 1447e8bfb5 Merge pull request #345 from orangemug/feature/option-to-download-with-own-tokens
Option to download styles with your own tokens
2018-07-16 08:10:43 +01:00
orangemug c0480a50ea Option to download styles with own tokens. 2018-07-15 22:51:57 +01:00
Orange Mug 09ba2be416 Merge pull request #344 from orangemug/fix/map-overflow-zoom-issues
Fixed map width so it no longer overflows
2018-07-15 22:44:51 +01:00
Orange Mug 115ce3305d Merge pull request #343 from orangemug/fix/disable-bounce-scroll
Prevent bounce scroll on <body/>
2018-07-15 22:11:18 +01:00
orangemug 960b2022ed Fixed map width (fixes #260) 2018-07-15 22:08:06 +01:00
orangemug 252b442ca9 The UI is 100% height so prevent bounce scroll on OSX 2018-07-15 21:51:25 +01:00
Orange Mug 03b9ddda9c Merge pull request #342 from orangemug/fix/layer-editor-overflow
Fixed <LayerEditor/> overflow issues
2018-07-15 21:49:17 +01:00
orangemug 968d7d7fda Fixed <LayerEditor/> overflow issues. 2018-07-15 13:17:47 +01:00
orangemug b211f1cd12 1.3.0 2018-07-12 15:54:01 +01:00
Orange Mug 870d4349f4 Merge pull request #341 from orangemug/fix/normalizeSourceURL-import-error
Fixed normalizeSourceURL import issue
2018-07-12 14:23:16 +01:00
orangemug d88bc59720 Fixed normalizeSourceURL import issue. 2018-07-12 12:33:40 +01:00
orangemug 7c00775515 1.3.0-beta 2018-07-11 08:22:30 +01:00
Orange Mug 4b5536b282 Merge pull request #335 from gregorywolanski/survey
Survey
2018-07-08 15:50:29 +01:00
Gregory Wolanski fb84cfee1c Survey (#328): Proper contrast ratio 2018-07-08 16:27:59 +02:00
Gregory Wolanski 9132262106 Merge branch 'survey' of https://github.com/gregorywolanski/editor into survey 2018-07-08 14:43:03 +02:00
Gregory Wolanski 5de9e708e9 Survey (#328): Cleaning 2018-07-08 14:42:49 +02:00
Gregory Wolanski 4df63c7287 Update _base.scss 2018-07-08 14:38:52 +02:00
Gregory Wolanski a88ca031d0 Survey (#328)
Elements promoting the survey inside Maputnik after feedback
2018-07-08 14:34:46 +02:00
Gregory Wolanski 452706f35c Survey (#328) 2018-06-30 10:17:14 +02:00
Gregory Wolanski 8b0aa194cf Survey (#328)
Elements promoting the survey inside Maputnik after feedback
2018-06-30 10:09:23 +02:00
Orange Mug b9aa7e9206 Merge pull request #333 from pathmapper/master
Update repository for OSM Liberty
2018-06-30 07:09:15 +02:00
pathmapper e35f106482 Update repository for OSM Liberty 2018-06-29 11:20:32 +02:00
Gregory Wolanski b7a97cf8ee Survey (#328)
Elements promoting the survey inside Maputnik
2018-06-25 19:52:48 +02:00
orangemug 85a28999fb Initial color accessibility UI 2018-06-18 20:28:24 +01:00
Orange Mug 9208115981 Merge pull request #330 from orangemug/feature/loading-modal
Loading dialog
2018-06-18 20:27:39 +01:00
orangemug afbdaecd0a Abstracted out <LoadingModal/> 2018-06-18 19:06:16 +01:00
orangemug 558f3d649d Added dialog styling. 2018-06-18 18:17:33 +01:00
Orange Mug 417511d577 Merge pull request #329 from orangemug/feature/osm-donate-readme
Added link to <https://maputnik.github.io/donate>
2018-06-16 09:48:18 +01:00
orangemug df350534ce Added link to <https://maputnik.github.io/donate> 2018-06-16 09:46:30 +01:00
orangemug 7167235146 Added loading modal when opening styles. 2018-06-15 20:57:39 +01:00
Orange Mug 7a7f2eb7de Merge pull request #315 from orangemug/feature/option-to-display-tile-boundaries
Added option to display tile boundaries
2018-06-03 20:26:17 +01:00
orangemug cd28a53f6a Fixed failing tests, these weren't flaky tests... ooops! 2018-06-03 18:28:55 +01:00
orangemug 1fe31ac0ec Fix for bad lint error. 2018-06-03 17:55:46 +01:00
orangemug ffce8e3ba5 Added missing file. 2018-06-03 17:37:54 +01:00
Orange Mug a28a417ebc Merge pull request #314 from orangemug/fix/various-fixes
Small bug fixes
2018-06-03 17:35:44 +01:00
orangemug 6cdb56d13f Improved showTileBoundaries and query string support 2018-06-03 17:33:08 +01:00
orangemug 0516e587b4 Added option to display tile boundries (issue #202) 2018-06-03 17:17:45 +01:00
orangemug 5b4063105b Added missing 'noopener noreferrer' 2018-06-03 16:59:41 +01:00
orangemug d9a5548762 Small bug fixes
- Logo DOM sctrucutre now valid, no longer <a/> within </a>
 - `data-wd-key` not longer required
 - `maputnik-doc-popup` not longer hidden by LayerEditor accordion
2018-06-03 16:37:46 +01:00
Orange Mug cae6cffb7b Merge pull request #313 from orangemug/feature/shortcuts
Keyboard shortcuts
2018-06-03 11:18:16 +01:00
orangemug ede782abed Fixed typo. 2018-06-03 10:18:55 +01:00
orangemug 00afbad7ac Fixed lint errors. 2018-06-03 10:00:50 +01:00
Orange Mug edd09ef585 Merge pull request #306 from orangemug/feature/accessibility-list-reorder
Keyboard accessible layer options
2018-06-03 09:57:00 +01:00
orangemug 1e09066779 Merge branch 'feature/accessibility-list-reorder' into feature/shortcuts
Conflicts:
	src/components/App.jsx
2018-06-03 09:41:07 +01:00
orangemug 32edb48e16 Fix for when 'layout.visibility' is undefined 2018-06-03 09:31:02 +01:00
orangemug b116eef147 Merge remote-tracking branch 'upstream/master' into feature/accessibility-list-reorder
Conflicts:
	src/components/App.jsx
2018-06-03 09:22:02 +01:00
orangemug 74d1cd2d01 Renamed 'Sources' -> 'Data Sources' to make it clearer and make shortcuts easier to remember. 2018-06-03 09:17:53 +01:00
Orange Mug fd48d82e42 Merge pull request #312 from orangemug/feature/color-filters
Color blindness emulation
2018-06-02 10:21:39 +01:00
orangemug 480d54c2d8 Finished shortcuts modal styling 2018-06-02 10:17:39 +01:00
orangemug ab9c39b862 Removed additional close button 2018-06-01 20:51:42 +01:00
orangemug dd122d1bac Hide hidden FileReaderInput from keyboard focus 2018-06-01 20:45:05 +01:00
orangemug f9f5e8f925 Changed close button from <a> to <button> 2018-06-01 20:40:51 +01:00
orangemug aa2f4a091c Initial attempt at color blindness emulation 2018-06-01 09:22:18 +01:00
orangemug 13fc699d4a Styling fixes. 2018-05-31 21:09:31 +01:00
orangemug f5e8d473ad Changed toggle visibility text from hide to show/hide 2018-05-31 20:40:21 +01:00
orangemug 35353d75f5 Added application shortcuts and shortcut modal.
Also moved modals into App.jsx to move the business logic to one place.
2018-05-29 17:06:00 +01:00
Orange Mug 0f103c3c00 Merge pull request #309 from orangemug/feature/skip-menu
Added skip-menu link for keyboard users
2018-05-28 13:17:02 +01:00
orangemug 019428a241 Added missing prop-types. 2018-05-28 12:06:22 +01:00
orangemug 6200edea25 Added initial shortcuts. 2018-05-28 12:03:47 +01:00
orangemug fc7395df96 Fixed CircleCI cache to include {{arch}} 2018-05-28 11:34:12 +01:00
orangemug 272f662a34 Changed 'skip' wording
As outlined in <https://webaim.org/techniques/skipnav/>
2018-05-28 11:29:49 +01:00
orangemug d59d9cde95 Fixed OSX working directory if CircleCI config. 2018-05-28 11:19:04 +01:00
orangemug c71fbcf436 Tidy 2018-05-28 11:15:16 +01:00
Orange Mug 54c79445db Merge pull request #307 from orangemug/fix/public-source-button-size
Fixed public source button size
2018-05-28 10:52:23 +01:00
orangemug a82ba26f86 Added skip-menu link for keyboard users. 2018-05-28 10:50:19 +01:00
orangemug 28af87391d Fixed public source button size. 2018-05-22 21:43:35 +01:00
orangemug 0aabd33538 Remove empty scss blocks 2018-05-22 21:26:11 +01:00
orangemug bd9076c4ff Added additional menu in <LayerEditor/>
This is to make the following options accessible to keyboard users

 - reorder layers
 - duplicate layer
 - delete layer
 - hide/show layer
2018-05-22 21:16:46 +01:00
Orange Mug 1aed761893 Merge pull request #305 from orangemug/feature/public-style-aria-labels
Added aria-label to public styles
2018-05-19 09:39:13 +01:00
orangemug a2a6f6dcab Added aria-label to public styles, also fixed button to reserve space in DOM (fixes #245) 2018-05-19 08:23:41 +01:00
Orange Mug db5dd0f6ee Merge pull request #304 from orangemug/fix/disable-spellcheck-v2
Disable spellcheck on <input/>'s
2018-05-19 07:56:06 +01:00
orangemug 42c3dcf258 Updated package-lock.json 2018-05-17 13:49:24 +01:00
orangemug 51a115d65a Disable spell checking on <input>'s 2018-05-17 13:44:54 +01:00
Orange Mug fc0fbd6a37 Merge pull request #302 from orangemug/feature/terrarium-encoding
Added support for encoding to raster-dem source
2018-05-17 13:42:01 +01:00
orangemug d80d76724c Fixed more lint errors. 2018-05-17 11:46:33 +01:00
orangemug 77da0a6d30 React v16.3.0 fixes. 2018-05-17 11:24:39 +01:00
orangemug 79b251d8b9 DRY up the code. 2018-05-17 10:55:55 +01:00
orangemug 4f19f6a08c Added support for encoding to raster-dem source, enabling terrarium tiles. 2018-05-17 10:44:54 +01:00
Orange Mug d2a6eab1e6 Merge pull request #291 from orangemug/feature/circle-ci-osx-builds
CircleCI OSX builds
2018-05-11 15:50:48 +01:00
Orange Mug c7cf051502 Merge pull request #296 from orangemug/feature/prefers-reduced-motion
Added prefers-reduced-motion support
2018-05-11 15:50:08 +01:00
Orange Mug 6e21503e6b Merge pull request #297 from orangemug/accessibility/larger-color-swatch
Make color swatch larger so its easier to see
2018-05-11 15:49:32 +01:00
orangemug 78d71a4e7e Fixed duplicate definition. 2018-05-11 14:53:06 +01:00
orangemug b8f32d46cf Rename <CollapseReducedMotion/> to <Collapse/> 2018-05-11 14:03:46 +01:00
Orange Mug 443782decf Merge pull request #300 from orangemug/accessibility/react-aria-modal
Added accessible modal via react-aria-modal
2018-05-11 13:54:39 +01:00
orangemug 54e79e5eb8 Added missing data-wd-key attribute. 2018-05-11 11:26:43 +01:00
orangemug 221cd4ffd2 Added accessible modal via react-aria-modal 2018-05-11 10:56:34 +01:00
Orange Mug 354b2fb3cb Merge pull request #298 from orangemug/fix/keyboard-accessible-buttons
Made buttons keyboard accessible
2018-05-11 10:47:11 +01:00
orangemug 7cb2c36ac9 Move accessibility checks into module. 2018-05-11 09:32:57 +01:00
orangemug 11d73595fc Made buttons keyboard accessible. 2018-05-10 16:50:37 +01:00
orangemug c241a6e280 Ignore 'prefers-reduced-motion' in stylelint 2018-05-10 16:30:23 +01:00
orangemug 198ff143f6 Make color swatch larger so its easier to see. 2018-05-10 16:18:13 +01:00
orangemug 7b8b797f9c Fixed typo. 2018-05-10 16:07:34 +01:00
orangemug a41b25eea7 Added 'prefers-reduced-motion' css support. 2018-05-10 16:05:55 +01:00
Orange Mug 06eac68f9d Merge pull request #293 from orangemug/maintenance/update-deps-20180509
Updated deps
2018-05-10 08:33:18 +01:00
orangemug 8abf84ebc0 Updated deps. 2018-05-09 09:39:03 +01:00
orangemug e9aa1f6dd6 Fixed typo 2018-05-08 17:34:09 +01:00
orangemug 8e7b838bf7 Altered versions for node.js release schedule
See <https://github.com/nodejs/Release>
2018-05-08 17:30:42 +01:00
orangemug 32db3c3c9b Added build-osx-node-v9 to CircleCI 2018-05-08 17:23:03 +01:00
orangemug 502586e5d5 1.2.0 2018-05-08 16:11:13 +01:00
Orange Mug d92d599d8a Merge pull request #290 from orangemug/fix/disable-gist
Disable gist export
2018-05-08 15:55:23 +01:00
orangemug 3487056c7d Disable gist, see <https://github.com/maputnik/editor/issues/269> 2018-05-08 15:21:14 +01:00
orangemug dbcfb08c15 1.2.0-beta2 2018-04-20 15:31:00 +01:00
Orange Mug e96141090e Merge pull request #287 from orangemug/fix/beta-version-wrapping
Fix to allow beta version strings to not wrap
2018-04-20 15:27:48 +01:00
orangemug 5bd25fc2ed Fix to allow beta version strings to not wrap. 2018-04-20 15:09:37 +01:00
orangemug 334932b298 1.2.0-beta 2018-04-20 14:53:51 +01:00
Orange Mug 661006d7fb Merge pull request #284 from pjsier/fix/276-null-zoom
Handle data functions without zoom
2018-04-20 14:14:02 +01:00
Orange Mug c917249517 Merge pull request #286 from orangemug/maintenance/update-stylelint
Updated stylelint
2018-04-17 15:56:01 +01:00
orangemug d0ca732fe7 Updated stylelint and fixed scss for 'stylelint-config-recommended-scss' 2018-04-17 14:55:33 +01:00
Orange Mug 52821cd1df Merge pull request #285 from orangemug/maintenance/update-deps-20180417
Updated deps
2018-04-17 12:11:22 +01:00
orangemug 328e0b8ff7 Updated deps. 2018-04-17 11:35:30 +01:00
Orange Mug f0147cc89a Merge pull request #280 from orangemug/fix/web-driver-tests-v8
Improved tests
2018-04-16 20:48:56 +01:00
orangemug 78a7f152e7 Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8
Conflicts:
	src/styles/index.scss
2018-04-16 15:31:27 +01:00
pjsier e936dd16bf Fix style linting error 2018-04-16 07:44:00 -05:00
pjsier 3d4579288c Handle data functions without zoom 2018-04-16 06:59:01 -05:00
Orange Mug b60df8b074 Merge pull request #283 from orangemug/fix/issue-244
Fix to allow layer sections to expand smoothly
2018-04-15 14:56:21 +01:00
orangemug c4b92fa0a9 Updated test instructions in README 2018-04-15 09:17:07 +01:00
orangemug 9808d44c71 Fix to allow layers sections to expand smoothly. Fixes #244 2018-04-13 17:00:51 +01:00
Orange Mug 1bdd135386 Merge pull request #282 from oterral/teo_fixed
Use a fixed position for autocomplete menu
2018-04-13 15:53:27 +01:00
Orange Mug 740a75f2e6 Merge pull request #281 from oterral/master
Block the popup on click in inspect mode
2018-04-13 15:06:28 +01:00
oterral b62533fa3e Use a fixed position for autocomplete menu 2018-04-13 15:55:16 +02:00
oterral 044349e65f Block popup on click in inspect mode 2018-04-13 14:25:08 +02:00
oterral e8b0bd4d0a Update mapbox-gl-inspect dependency 2018-04-13 14:24:39 +02:00
orangemug 45bdf53a41 Added thunderforest maputnik token. 2018-04-11 16:20:23 +01:00
orangemug 00e94212bd Added initial thunderforest source integration 2018-04-11 15:53:40 +01:00
orangemug 1805aee7ba Removed lint-styles in appveyor
It doesn't work in windows and should be addressed in another PR
2018-04-10 16:16:51 +01:00
orangemug 8ba2123a26 Added missing propType. 2018-04-10 15:15:29 +01:00
orangemug 687c08527d Added test docs. 2018-04-10 15:13:55 +01:00
orangemug f0744f024d Moved commit. 2018-04-10 15:07:36 +01:00
orangemug 9e82599464 Removed old comments. 2018-04-10 14:23:11 +01:00
orangemug 7a60df370e Changed url to be local (although not used) 2018-04-10 14:20:13 +01:00
orangemug aee4a041fe Removed node:10 from appveyor 2018-04-10 14:03:09 +01:00
orangemug 6fa06e5483 Removed un-useful comments 2018-04-10 14:02:36 +01:00
orangemug 15962481ee Disable OSX until we get a open source plan for maputnik/editor 2018-04-10 13:35:02 +01:00
orangemug 6bf695cd4b Removed linux from travis. CircleCI now takes care of that 2018-04-10 13:34:20 +01:00
orangemug 7ecbc14c39 Added OSX build to tests. 2018-04-10 13:29:48 +01:00
orangemug fb0e531f4a Removed node:10 as it doesn't exist yet. 2018-04-10 13:17:59 +01:00
orangemug bd44e6d071 Fixed typo. 2018-04-10 13:11:42 +01:00
orangemug 3ae37f1c46 Updated appveyor to no longer test, only build/lint 2018-04-10 13:08:55 +01:00
orangemug 8c7a1f7075 Updated build config for circleci to only test webdriver in one job 2018-04-10 13:05:58 +01:00
orangemug 3e97d8a5f1 Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8 2018-04-10 12:56:43 +01:00
orangemug 6138257a89 Remove logging. 2018-04-10 12:52:59 +01:00
orangemug 0bd62985b9 Revert change to undo/redo 2018-04-10 12:45:44 +01:00
orangemug a346d757fd Don't assume docker for mac. 2018-04-09 18:18:15 +01:00
orangemug 84f3970730 Updated selenium-standalone & webdriverio 2018-04-09 17:51:12 +01:00
orangemug 050e22918a Fix for running within docker. 2018-04-09 17:49:56 +01:00
Orange Mug f205776695 Merge pull request #277 from maputnik/revert-275-maintenance/update-ol-mapbox-style
Revert "Update ol-mapbox-style ^2.10.1 -> ^2.11.2"
2018-04-09 13:54:12 +01:00
Orange Mug 4d427bcbc3 Revert "Update ol-mapbox-style ^2.10.1 -> ^2.11.2" 2018-04-09 13:53:25 +01:00
Orange Mug 0b4910e3c3 Merge pull request #275 from orangemug/maintenance/update-ol-mapbox-style
Update ol-mapbox-style ^2.10.1 -> ^2.11.2
2018-04-09 12:16:48 +01:00
orangemug 11a59debdf Update ol-mapbox-style ^2.10.1 -> ^2.11.2 2018-04-09 11:10:46 +01:00
orangemug dbe2c2637e Better onPrepare for wdio 2018-04-09 10:20:37 +01:00
Orange Mug d6ce13c356 Merge pull request #273 from cmarqu/patch-1
Fix small typo.
2018-04-09 09:42:46 +01:00
Orange Mug 6d094a8b3e Merge pull request #271 from ziveo/master
Adding mac keyboard bindings
2018-04-09 09:37:32 +01:00
Colin Marquardt 4d0456fd68 Fix small typo. 2018-03-27 00:45:42 +02:00
ziveo ad83f940a7 Merge branch 'master' into master 2018-03-18 20:02:20 -04:00
ziveo edc7e02f58 Merge pull request #2 from ziveo/develop__mac-keyboard-bindings
Improving keyboard bindings code
2018-03-16 23:01:34 -04:00
Bojan Zivkovic 7dfc5029a3 Improving keyboard bindings code 2018-03-16 23:00:33 -04:00
ziveo 8e02722b52 Merge pull request #1 from ziveo/develop__mac-keyboard-bindings
Adding mac keyboard bindings
2018-03-15 23:41:48 -04:00
Bojan Zivkovic 984581e01a Adding mac keyboard bindings 2018-03-15 23:39:32 -04:00
orangemug 1de7ba7e86 Use dev settings for test. 2018-03-06 21:11:58 +00:00
orangemug a3fa86f7ee Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v7
Conflicts:
	config/webpack.production.config.js
	package-lock.json
	package.json
2018-03-06 07:22:26 +00:00
Orange Mug a589f89c4c Merge pull request #268 from orangemug/fix/update-mapbox-gl-inspect
Updated mapbox-gl-inspect to v1.3.0
2018-02-19 09:40:53 +00:00
orangemug 3b599aed4c Updated mapbox-gl-inspect to v1.3.0 2018-02-19 08:28:08 +00:00
Orange Mug 6953db74c6 Merge pull request #266 from orangemug/maintenance/added-circle-symbol-pitch-alignment-paint-props
Added [symbol|circle]-pitch-alignment props
2018-02-18 17:59:13 +00:00
Orange Mug 1ad473a539 Merge pull request #267 from orangemug/feature/heatmap
Added heatmap layer support
2018-02-18 16:34:42 +00:00
orangemug fafda9ec92 Merge remote-tracking branch 'upstream/master' into maintenance/added-circle-symbol-pitch-alignment-paint-props 2018-02-18 15:00:22 +00:00
Orange Mug 11b85bf565 Merge pull request #263 from orangemug/feature/hillshading
Added hillshading support
2018-02-18 14:53:58 +00:00
orangemug 6ecc6670dc Added [symbol|circle]-pitch-alignment paint props 2018-02-18 13:23:04 +00:00
orangemug 553f0fe23e Drop support for 'heatmap-color'
See <https://github.com/maputnik/editor/issues/265#issuecomment-366511333>
2018-02-18 12:07:34 +00:00
orangemug 77ddf67201 Added heatmap layer type. 2018-02-18 11:50:04 +00:00
orangemug a092bc2689 Moved to using orangemug/mapbox-gl-inspect#fix/only-vector-sources
While <https://github.com/lukasmartinelli/mapbox-gl-inspect/pull/11> is
waiting to be merged/released.
2018-02-18 11:22:01 +00:00
orangemug 38e0786463 Added missing hillshade / raster-dem guards. 2018-02-17 07:45:24 +00:00
orangemug 180b17d315 Fixed typo raster -> raster-dem 2018-02-16 20:34:50 +00:00
orangemug 8acbd784a0 Added hillshading support. 2018-02-16 19:52:19 +00:00
Orange Mug 07efe1e1b8 Merge pull request #253 from orangemug/maintenance/openlayers-update
Updated openlayers
2018-02-07 22:56:01 +00:00
orangemug 7ea53cc3a1 Increased build timeout. 2018-02-07 11:38:32 +00:00
orangemug de21eea21b Some modules aren't ES5 so we much compile them 2018-02-07 11:00:24 +00:00
orangemug 8f8ed6dff3 Changed to uglifyjs-webpack-plugin for es2015 support. 2018-02-06 10:50:15 +00:00
orangemug 8915bbfeb4 Updated openlayers.
openlayers^4.4.2 -> ol^4.6.4
ol-mapbox-style^1.0.1 -> ol-mapbox-style^2.10.1

Fixes #246
2018-02-06 08:28:57 +00:00
Orange Mug df3a42acce Merge pull request #241 from orangemug/feature/private-public-gist
Public/private gists
2018-02-03 15:43:12 +00:00
Orange Mug 2a7ef82d23 Merge pull request #248 from orangemug/feature/nsp
Added nsp (node security project)
2018-02-03 15:41:42 +00:00
orangemug 95168f22e3 Added nsp 2018-02-03 15:30:29 +00:00
Orange Mug 4360753263 Merge pull request #242 from orangemug/feature/update-mapbox-gl-v0.44.0
Updated mapbox-gl 0.43.0 -> 0.44.0
2018-02-03 14:02:45 +00:00
Orange Mug ad491cb465 Merge pull request #240 from orangemug/fix/do-not-expose-fallback-tokens
Do not expose fallback tokens during export
2018-02-03 14:02:06 +00:00
orangemug e5bed80c96 Updated mapbox-gl 0.43.0 -> 0.44.0. Fixes #237 2018-02-02 18:04:57 +00:00
orangemug 9bf3046d4c Public/private gists added. Fixes #238
Gists are now private by default with a option for public.
2018-02-02 17:23:21 +00:00
Orange Mug da8dc0f7a6 Merge pull request #231 from justenPalmer/issues
Issue 229: Adding a style without Glyphs defined throws an exception with no feedback in interface
2018-02-02 16:43:18 +00:00
orangemug b66a4afd28 Do not expose fallback tokens during export. Fixes #230 2018-02-02 15:33:15 +00:00
Orange Mug a94c53534c Merge pull request #235 from orangemug/feature/export-token-fix
Fixes for export to add in mapbox access token
2018-02-02 11:47:41 +00:00
Orange Mug 6b22c9130f Merge pull request #236 from orangemug/fix/issue-234
Added guard in fetchSources
2018-02-02 11:24:23 +00:00
orangemug 7d5927bbc8 Added additional guard
As checking the key name is 'openmaptiles' isn't a guarantee
2018-02-01 22:00:26 +00:00
jPalmer 240d02a124 Merge branch 'master' of https://github.com/maputnik/editor into issues 2018-02-01 13:44:23 -08:00
jPalmer 92ef1c4cbb added more robust handling of glyphs in styles - addresses #229 2018-02-01 13:44:15 -08:00
orangemug 5ce57d0803 Added guard in fetchSources.
This will mean that autocomplete is broken for sources without vector_layers key present.
2018-02-01 21:37:17 +00:00
orangemug 1c134d757c Fixes for export to add in mapbox access token. 2018-02-01 19:54:44 +00:00
Orange Mug 32d808b230 Merge pull request #233 from orangemug/feature/version-in-ui
Added version number to the UI
2018-02-01 08:10:21 +00:00
orangemug ee3def492a Fixed toolbar version position. 2018-01-31 21:36:47 +00:00
orangemug 41bd91fcd2 Center the toolbar button text. 2018-01-31 21:22:12 +00:00
orangemug 02c8542848 Added version number to the UI. Fixes #232 2018-01-31 21:04:49 +00:00
jPalmer 844abd38ce added missing glyphs property check on styleChanged - addresses #229 2018-01-31 11:28:09 -08:00
jPalmer d9b6f28bb5 added missing glyphs property check on styleChanged - addresses #229 2018-01-31 11:26:10 -08:00
orangemug ed85b838ec v1.1.0 2018-01-30 20:57:24 +00:00
Orange Mug f82b138a3d Merge pull request #228 from orangemug/fix/source-layer-guard
Added guard to <LayerSourceLayerBlock/> sourceLayerIds
2018-01-30 17:49:41 +00:00
orangemug 89c38991b9 Added guard to <LayerSourceLayerBlock/> sourceLayerIds 2018-01-29 17:18:30 +00:00
orangemug 0e4c06cc3e Merge remote-tracking branch 'origin/master' 2018-01-26 15:33:01 +00:00
orangemug 7e510a2582 v1.1.0-beta4 2018-01-26 15:31:33 +00:00
Orange Mug f3cb9c4fdd Merge pull request #227 from orangemug/fix/mapbox-urls
Added support for mapbox:// urls to fetchSources
2018-01-26 12:37:56 +00:00
orangemug f0f6130272 Fixed typo. 2018-01-25 19:58:01 +00:00
orangemug 0ebb299fd0 Added try/catch around mapboxUtil.normalizeSourceURL 2018-01-25 19:40:54 +00:00
orangemug 9d96525f12 Added support for mapbox:// urls. 2018-01-25 19:16:06 +00:00
Orange Mug fc6f9251f7 Merge pull request #226 from orangemug/fix/modal-safari
Fix for safari modal appearing below the overlay
2018-01-25 18:17:18 +00:00
orangemug 53cb317155 Fix for safari modal appearing below the overlay. Fixes #225 2018-01-25 08:30:23 +00:00
orangemug 4215b5808f Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6-circleci-config
Conflicts:
	package-lock.json
	src/components/inputs/AutocompleteInput.jsx
2018-01-22 09:57:54 +00:00
orangemug 2d2f9744e2 v1.1.0-beta3 2018-01-22 09:13:42 +00:00
Orange Mug d0b835ee52 Merge pull request #222 from gregorywolanski/95
Source change handling bug fix (#95)
2018-01-22 08:52:28 +00:00
Grzegorz Wolański 1798305f9c Source change handling bug fix (#95) 2018-01-22 08:49:39 +01:00
Orange Mug 4b0768d0a6 Merge pull request #221 from orangemug/fix/added-guard-to-get-sources
Added guard to getSources
2018-01-21 19:08:10 +00:00
orangemug 2e79a8ff4c Added guard to getSources 2018-01-20 09:39:18 +00:00
orangemug e64ca3eb93 Added back in other jobs. 2018-01-19 18:15:46 +00:00
orangemug 094c4747d3 Update selenium/standalone-chrome to 3.8.1 2018-01-19 18:02:08 +00:00
orangemug 62f0843283 Moved back to workflows. 2018-01-19 17:55:37 +00:00
orangemug 8062e304b7 Update selenium/standalone-chrome 2018-01-19 17:51:08 +00:00
orangemug 18e7ead78a Revert to old config. 2018-01-19 17:35:19 +00:00
orangemug 3cab1dc49f Remove special directory. 2018-01-19 17:29:55 +00:00
orangemug f8dcbb8fb7 Reduce to single job. 2018-01-19 17:24:29 +00:00
orangemug c82f38c103 Multiple working directories for test versions. 2018-01-19 17:14:56 +00:00
orangemug fe0e7af033 Added multiple nodejs versions. 2018-01-19 15:13:46 +00:00
orangemug ac51902435 Added missing workflow to .circleci/config.yml 2018-01-19 15:08:45 +00:00
orangemug e0ff342702 Added yaml inheritance to .circleci/config.yml 2018-01-19 15:06:23 +00:00
orangemug 664125d820 v1.1.0-beta2 2018-01-19 13:56:38 +00:00
Orange Mug 9ae2f2c5af Merge pull request #219 from orangemug/fix/autocomplete-menu-issues
Autocomplete fixes
2018-01-19 13:45:38 +00:00
orangemug 721f9b36b3 Added missing shouldItemRender to <Autocomplete/>. #219 2018-01-19 12:11:34 +00:00
orangemug a33d1b819c Autocomplete fixes #218 2018-01-19 11:58:25 +00:00
orangemug cb4f5ea963 Updated to react/react-dom v16.2.0 2018-01-18 23:15:59 +00:00
Orange Mug 3c0ebfabab Merge pull request #213 from gregorywolanski/60
Clickable layer tooltips (#60)
2018-01-18 23:03:19 +00:00
orangemug a822430e1d Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v6
Conflicts:
	package-lock.json
2018-01-18 22:59:59 +00:00
Gregory Wolanski 0ba11b94c8 Merge branch 'master' into 60 2018-01-18 23:58:06 +01:00
Orange Mug 390e90e8c2 Merge pull request #209 from gregorywolanski/41
Remove duplicated features from popups (#41)
2018-01-18 22:40:51 +00:00
orangemug 59ef8eb4e4 v1.1.0-beta 2018-01-18 22:19:05 +00:00
Orange Mug 2b382a9946 Merge pull request #217 from orangemug/pr-214
Updated to mapbox-gl@0.43.0
2018-01-18 21:48:31 +00:00
orangemug d52d55dd6a Updated to mapbox-gl-js v0.43.0. Fixes issue #212 2018-01-18 21:22:18 +00:00
orangemug dc40ce7d9e Fixed lint errors. 2018-01-17 17:58:01 +00:00
orangemug 383a119127 Added linting to circleci tests. 2018-01-17 17:55:21 +00:00
orangemug 3f492e6208 Change artifacts destination. 2018-01-17 17:43:35 +00:00
orangemug 0cec0cf595 Fix coverage in tests. 2018-01-17 17:36:46 +00:00
orangemug bc19aea438 CircleCI test now just calls npm test 2018-01-17 17:01:55 +00:00
orangemug 211850c813 Added cross-env 2018-01-17 16:53:42 +00:00
orangemug c1312fb288 Added '/build' to .gitignore 2018-01-17 15:46:48 +00:00
orangemug 0c2934c489 Code to store artifacts on circle ci 2018-01-17 15:44:00 +00:00
orangemug ad34147f28 Fixed screenshots. 2018-01-17 15:39:17 +00:00
orangemug 1eb6c28617 Removed logging. 2018-01-17 14:59:48 +00:00
orangemug 2e8a188bce Increased timeouts. 2018-01-17 14:51:25 +00:00
Tobin Bradley ed495c3216 Update export to use GL JS 0.43.0
Fixes #212 broken bl.ocks preview.
2018-01-12 11:37:05 -05:00
orangemug a773958403 Tidy tests. 2018-01-10 15:06:11 +00:00
Grzegorz Wolański 6a6595d971 Clickable layer tooltips (#60) 2018-01-08 22:18:30 +01:00
orangemug 942b2240a7 Added more webdriver tests testing against a real browser. 2018-01-05 17:45:55 +00:00
Orange Mug 6e86c60f89 Merge pull request #185 from gregorywolanski/130
Add expand/collapse all layer groups feature (#130)
2018-01-04 15:52:38 +00:00
Grzegorz Wolański ace6812e89 Remove duplicated features from popups (#41) 2017-12-05 23:27:17 +01:00
Grzegorz Wolański 604fa6317c Expand/Collapse button position bug fix 2017-11-30 20:40:56 +01:00
Orange Mug 4479473b37 Merge pull request #207 from orangemug/fix/update-codemirror
Update to react-codemirror2
2017-11-30 09:14:54 +00:00
Orange Mug 4dc8fc9696 Merge pull request #205 from orangemug/fix/fetch-sources-get-called-on-each-change
Fix to stop fetchSources getting called on each change
2017-11-30 07:31:32 +00:00
Orange Mug bac59d595d Merge pull request #204 from orangemug/fix/catch-invalid-color
Catch invalid color
2017-11-29 21:58:06 +00:00
Orange Mug ed98db8ae3 Merge pull request #199 from orangemug/fix/issue-97-layer-list-cutoff
Fixed layer list cutoff (#97)
2017-11-29 19:30:19 +00:00
Orange Mug b66eb66358 Merge pull request #201 from orangemug/fix/lighthouse-errors
Google lighthouse audit fixes
2017-11-29 19:29:23 +00:00
orangemug 934a994ac5 Update to react-codemirror2
react-codemirror is no longer maintained
2017-11-29 19:22:41 +00:00
orangemug 199a989f7d Fix to stop fetchSources getting called on each change. 2017-11-29 18:13:47 +00:00
orangemug a50b09e5a2 Tidy logic. 2017-11-29 18:07:03 +00:00
orangemug b20c69b15a Catch invalid color during parse. 2017-11-29 18:00:52 +00:00
Yuri Astrakhan 25be173487 Merge pull request #200 from orangemug/fix/issue-116-zoom-field-v3
Fix zoom field input ordering (#116)
2017-11-29 10:50:18 -05:00
orangemug 61808d5939 Fixed lint errors. 2017-11-29 15:03:37 +00:00
orangemug de24227b1f Updated package-lock.json 2017-11-29 11:34:08 +00:00
orangemug 1f5608ec77 Added manifest.json to production webpack config. 2017-11-29 11:29:48 +00:00
orangemug 2d87e162f1 Merge remote-tracking branch 'upstream/master' into fix/lighthouse-errors 2017-11-29 11:14:54 +00:00
orangemug 1941fdf8a0 Merge remote-tracking branch 'upstream/master' into fix/issue-116-zoom-field-v3 2017-11-29 10:56:56 +00:00
orangemug 33fdc52667 Added MAX_HEIGHT constant. 2017-11-29 10:29:11 +00:00
orangemug e11a5a823a Only limit AutoComplete to window bounds if element is fixed. 2017-11-29 10:20:07 +00:00
orangemug b60d101d42 Fixed PropTypes typo. 2017-11-29 10:19:22 +00:00
orangemug 5e9263b787 Merge remote-tracking branch 'upstream/master' into fix/issue-97-layer-list-cutoff 2017-11-29 10:09:56 +00:00
Orange Mug 949bd783f5 Merge pull request #195 from orangemug/feature/webpack-bundle-analyzer
Webpack bundle analyzer
2017-11-28 08:58:23 +00:00
Orange Mug 7fe3137fd0 Merge pull request #196 from orangemug/fix/source-layer-autocomplete
Improved source/layer autocomplete
2017-11-28 08:57:24 +00:00
orangemug 3c97fbe587 tabs -> spaces. 2017-11-17 17:27:16 +00:00
orangemug 030d469d7c Broke <FunctionSpecField/> into smaller parts. 2017-11-17 17:17:53 +00:00
orangemug 135ef8ed89 Merge remote-tracking branch 'upstream/master' into fix/issue-116-zoom-field-v2 2017-11-17 13:23:48 +00:00
orangemug 002e9c4647 Fix for new sources definition. 2017-11-17 13:06:26 +00:00
orangemug a4fbe55012 Added type to sources list and now filtering in modal autocomplete. 2017-11-17 11:43:56 +00:00
orangemug 63ac707415 Call fetchSources after component mount. 2017-11-17 10:53:46 +00:00
orangemug b5dc04bb4f Merge remote-tracking branch 'upstream/master' into fix/source-layer-autocomplete 2017-11-17 10:41:23 +00:00
orangemug f3ae20f3aa Updated package-lock. 2017-11-17 10:26:49 +00:00
orangemug 1838b8aefd Merge remote-tracking branch 'upstream/master' into feature/webpack-bundle-analyzer
Conflicts:
	config/webpack.production.config.js
2017-11-17 10:22:28 +00:00
Orange Mug e9c65e1ada Merge pull request #193 from orangemug/fix/tooltip-pointer-events
Disable pointer-events on doc tooltips
2017-11-16 16:20:52 +00:00
orangemug 9ea5d213f7 Merge remote-tracking branch 'upstream/master' into fix/tooltip-pointer-events 2017-11-16 13:06:40 +00:00
Orange Mug 7dcd6d5552 Merge pull request #192 from orangemug/fix/update-deps
Updated dependencies
2017-11-16 13:04:56 +00:00
orangemug 0de8f2d633 Moved node.js test versions to match latest LTS
https://github.com/nodejs/Release
2017-11-15 14:45:50 +00:00
orangemug cb2f854dd5 Sub-dependencies broke their API without a major version bump.
This fixes those errors and adds a package-lock.json
2017-11-15 14:29:56 +00:00
orangemug 401c920e47 Fix to keep autocomplete menu within window bounds. 2017-11-08 15:44:43 +00:00
orangemug 40235fe473 Initial work to reorder zoom fields. 2017-11-08 13:45:34 +00:00
orangemug a76e08aee7 Fixed source layer autocomplete to fetch from the sources json definition 2017-11-08 11:11:36 +00:00
orangemug dfe7282510 Fixed some errors reported in google lighthouse audit tool. 2017-11-08 10:13:02 +00:00
orangemug 3aae2e976f Merge remote-tracking branch 'upstream/master' into fix/update-deps
Conflicts:
	src/components/Toolbar.jsx
2017-11-08 09:01:35 +00:00
orangemug f79a945fa4 Fixed more eslint errors. 2017-11-08 08:51:24 +00:00
orangemug 8234c51412 Fixed eslint errors. 2017-11-08 08:47:36 +00:00
orangemug f464f997d1 Added 'pointer-events: none' to prevent tooltips from overlapping the UI. 2017-11-07 18:29:55 +00:00
orangemug e0b7cdf9dd Removed nodejs v4 tests temporarily 2017-11-07 18:20:35 +00:00
orangemug a819154145 Moved to testing from webpack.production.config also added verbose logging. 2017-11-07 18:13:06 +00:00
Orange Mug 616f45c586 Merge pull request #191 from orangemug/fix/console-errors
Fixed startup errors/warnings
2017-11-07 15:05:16 +00:00
orangemug 203aaf51b7 Removed old plugins from webpack config. 2017-11-07 11:50:00 +00:00
orangemug 392d1fe26d Added webpack-bundle-analyzer 2017-11-07 11:48:01 +00:00
orangemug f452ea0d26 Fixed webpack production conf after updated deps.
See <https://webpack.js.org/guides/migrating/#occurrenceorderplugin-is-now-on-by-default>
2017-11-07 11:35:46 +00:00
Orange Mug 97dbb74486 Merge pull request #189 from orangemug/feature/disable-polling-by-default
Disable polling by default
2017-11-07 11:15:50 +00:00
Orange Mug 1f80cfcaa6 Merge pull request #190 from orangemug/feature/overflow-toolbar-actions
Added css overflow scroll to toolbar actions
2017-11-07 11:14:16 +00:00
orangemug 5d0fbabb6a Updated mocha dep. 2017-11-07 11:07:44 +00:00
orangemug b5ca0fa17b Updated webpack deps. 2017-11-07 11:05:30 +00:00
orangemug 41e1704d08 Updated extract-text-webpack-plugin 2017-11-07 10:56:08 +00:00
orangemug d4569237f5 Changed es2015 to env in babelrc. 2017-11-07 10:55:25 +00:00
orangemug b6ae51b5e5 Updated eslint deps. 2017-11-07 10:52:02 +00:00
orangemug 3015ba605d Switched to babel-preset-env from babel-preset-es2015
See <http://babeljs.io/env>
2017-11-07 10:48:15 +00:00
orangemug eb589d4039 Updated the webpack loader deps. 2017-11-07 10:44:52 +00:00
orangemug 271190f434 Updated more babel deps.
babel-loader fixed at 7.1.1 due to <https://github.com/babel/babel-loader/issues/505>
2017-11-07 10:41:40 +00:00
orangemug 0836790daf Upgraded babel dev deps. 2017-11-07 10:34:08 +00:00
orangemug b3b665fcb9 Bumped react/react-dom deps. 2017-11-07 10:25:24 +00:00
orangemug c050b02b8b Updated '@mapbox/mapbox-gl-style-spec' 2017-11-07 10:21:39 +00:00
orangemug a791403a6a Updated deps fixed for clean install. 2017-11-07 10:11:42 +00:00
orangemug a4c6a18353 Updated react-sortable-hoc to 0.6.8 to remove prop-types warnings. 2017-11-06 15:35:29 +00:00
orangemug 9bc603a510 Update to use prop-types module in components. 2017-11-06 15:32:04 +00:00
orangemug af25fb926b Bumped react-codemirror to 1.0.0 2017-11-06 15:12:51 +00:00
orangemug 365a0518a5 Removed the console.warn because the logging wasn't helpful. 2017-11-06 15:05:00 +00:00
orangemug 9801f49f4e Added noParse for prebuilt openlayers and mapbox-gl modules. 2017-11-06 14:58:23 +00:00
orangemug bb4f3482ad Removed required from minzoom/maxzoom as it can be undefined.
See <https://www.mapbox.com/mapbox-gl-js/style-spec/#layer-minzoom>
2017-11-06 14:45:03 +00:00
orangemug e148607c7a Removed required prop and fixed component name. 2017-11-06 14:13:45 +00:00
orangemug ae370f04c1 Added css overflow scroll to toolbar actions. 2017-11-06 10:23:51 +00:00
orangemug 89f6343abd Removed ignoring node_modules in webpack watch 2017-11-04 14:24:36 +00:00
orangemug ea55687171 Added note to the docs regarding WEBPACK_DEV_SERVER_POLLING 2017-11-03 11:12:23 +00:00
orangemug da0b4d7911 Disable webpack-dev-server polling by default. 2017-11-03 11:04:15 +00:00
Orange Mug e303283098 Merge pull request #187 from orangemug/feature/more-badges
Added more badges
2017-11-02 13:01:30 +00:00
orangemug 1119ff06c9 Added more badges. 2017-11-01 16:54:17 +00:00
Orange Mug adc8ed26c1 Merge pull request #179 from gregorywolanski/87
Display zoom level #87
2017-10-30 08:00:34 +00:00
Gregory Wolanski 06554b83dc Add expand/collapse all layer groups feature (#130) 2017-10-25 21:35:19 +02:00
Gregory Wolanski 06ea1d1697 Display zoom level #87 2017-10-19 20:41:38 +02:00
Orange Mug ddb3bcde43 Merge pull request #178 from pjsier/fix/layer-function-type
Assigning default function type from spec
2017-10-18 17:31:13 +01:00
Orange Mug db2f9efb93 Merge pull request #176 from orangemug/fix/noopener-noreferrer
Added rel="noopener noreferrer" to external links.
2017-10-17 16:43:48 +01:00
pjsier d32b15d425 Assigning default function type from spec 2017-10-16 14:19:19 -05:00
Orange Mug a67f9b2edb Merge pull request #175 from orangemug/feature/change-link-to-new-domain
Changed link from maputnik.com -> maputnik.github.io
2017-10-16 19:48:13 +01:00
orangemug c38547d4e7 Removed {} from props. 2017-10-16 15:18:29 +01:00
orangemug 3f350c30da Added rel="noopener noreferrer" to external links. 2017-10-16 15:01:35 +01:00
Orange Mug d502d9b1bb Merge pull request #174 from pjsier/feature/share-style-link
Add share style link, copy button
2017-10-16 14:55:12 +01:00
orangemug 06e1be716e Changed link from maputnik.com -> maputnik.github.io 2017-10-16 09:34:05 +01:00
pjsier cda855f1b7 Add share style link, copy button
This adds a copy to clipboard button and input with the style parameter
pre-populated after exporting a style to an anonymous gist. Also
includes the URL as an input next to the button.
2017-10-15 20:04:43 -05:00
Orange Mug 36def799c0 Merge pull request #172 from pjsier/fix/insecure-assets
Fix insecure asset loading
2017-10-14 20:08:19 +01:00
pjsier 2e671250b9 Remove tilezen tileset and style 2017-10-12 15:13:57 -05:00
pjsier c881534554 Fix insecure asset loading 2017-10-12 14:33:24 -05:00
Orange Mug e1f7336aa9 Merge pull request #166 from orangemug/feature/load-from-url
Added 'Load from URL' option in open modal
2017-10-12 19:14:31 +01:00
orangemug aa92e9da02 Merge remote-tracking branch 'upstream/master' into feature/load-from-url 2017-10-12 15:15:20 +01:00
Orange Mug 232b48ff62 Merge pull request #165 from gregorywolanski/master
Modal scrolling #156
2017-10-12 10:29:07 +01:00
Grzegorz Wolański a95b2932db Modal scrolling #156: Issue fixed 2017-10-11 23:11:40 +02:00
Orange Mug aa288a1e11 Merge pull request #161 from pjsier/feature/data-driven-styles
Add data-driven styling
2017-10-11 16:55:04 +01:00
Orange Mug 7e6efcb9b9 Merge pull request #169 from orangemug/feature/comments-field-docs
Added comments field doc and updated react-collapse to fix styling
2017-10-11 14:37:43 +01:00
Orange Mug 817d0a7e63 Merge pull request #170 from orangemug/fix/maputnik-logo-stretch
Fixes logo styling in toolbar
2017-10-11 14:34:43 +01:00
pjsier fa0067ce7b Update mapbox deps, clarify data prop scope 2017-10-11 08:01:55 -05:00
orangemug 9beacf7ef3 Fixed image path in test 2017-10-11 13:16:04 +01:00
pjsier b4292028c2 Fix default field bug 2017-10-11 05:58:32 -05:00
orangemug d7c099bcbb Fixed logo stying in toolbar, also switched to the logo in github:maputnik/design. 2017-10-11 11:17:02 +01:00
Orange Mug 36cd15f4f1 Merge pull request #168 from orangemug/feature/issue-114-boolean-types
Added true/false conversion to filter field
2017-10-11 10:27:43 +01:00
orangemug 92ff1a8499 Added comments field doc and updated react-collapse to fix styling. 2017-10-10 22:34:16 +01:00
pjsier 4af7a71220 Rename ZoomSpecField to FunctionSpecField 2017-10-10 14:23:20 -05:00
orangemug 611e170b5e Added true/false conversion to filter fields. Fixes #114 2017-10-10 18:41:54 +01:00
pjsier 148f64c261 Restrict data function types, reorder buttons
Checking the Mapbox style spec properties to see whether or not
exponential should be allowed as the property type, defaulting to
categorical which appears to work for either type. Also re-orders zoom
and data function buttons, aligning zoom right if data not supplied.
2017-10-10 10:30:06 -05:00
orangemug 2c3f47d3cb Added 'Load from URL' option in open modal. Fixes #120 2017-10-10 16:27:16 +01:00
Gregory Wolanski 8a6e24e5e7 Modal scrolling #156 2017-10-08 21:42:04 +02:00
pjsier 1d29f67065 Check for property-function support on data styles 2017-10-05 06:08:55 -05:00
pjsier 2ffb3e73e1 Re-add default field after style update 2017-10-05 05:50:47 -05:00
pjsier bba7aa3177 Merge branch 'master' into feature/data-driven-styles 2017-10-05 05:42:17 -05:00
Orange Mug c950a33031 Merge pull request #124 from orangemug/fix/issue-110-update-mapbox-style-spec
Update style spec
2017-10-05 06:16:04 +01:00
Orange Mug c9ab3bdbfc Merge pull request #163 from chriswhong/patch-1
Add related projects section
2017-10-05 06:00:36 +01:00
Chris Whong e32c2e865c Add 2017-10-04 22:42:04 -04:00
pjsier 9e52b0b7dc Remove default from data properties
It looks like default is not supported in this version of the style
spec, so pending the PR to update it I'm removing it as an input.
2017-10-01 21:07:55 -05:00
pjsier d731fb2cae Fix scss linter errors 2017-10-01 19:17:43 -05:00
pjsier e057fcaea1 Add data-driven styling to editor
Builds off of the ZoomSpecField component with separate options for
handling data-driven properties. Reuses most of the zoom field
functionality with tweaks that I tried to keep as small as possible, and
the layout is based off of comments on the existing issue.
2017-10-01 18:20:57 -05:00
Orange Mug fff1363134 Merge pull request #152 from orangemug/feature/circle-ci-artifact-builds
Per branch / commit builds
2017-07-22 13:43:47 +01:00
orangemug 4bbfe1040e Fixed regexp for windows. 2017-07-11 06:30:37 +01:00
Orange Mug bc6e2dc81b Merge pull request #149 from bartvde/proptype-warnings
Make sure propTypes accept what gets passed in
2017-07-07 09:07:25 +01:00
orangemug 0005698c10 Added build to post test step. 2017-07-06 19:59:12 +01:00
orangemug 53711966d2 Added circleci build artifacts. 2017-07-06 19:53:39 +01:00
Orange Mug d3b991aad4 Merge pull request #146 from bartvde/babel-preset
Add transform-class-properties plugin to babel config
2017-07-06 19:34:26 +01:00
Orange Mug 4ef19c321d Merge pull request #151 from bartvde/key-warning
Put key on the right element
2017-07-05 19:32:28 +01:00
bartvde a3e3b9dfe3 Put key on the right element 2017-06-29 10:20:24 -05:00
bartvde abbce3e9d1 Make sure propTypes accept what gets passed in 2017-06-26 16:54:46 -05:00
bartvde 0edbfd89ff Add transform-class-properties plugin to babel config 2017-06-26 16:24:07 -05:00
Orange Mug 040d585d57 Merge pull request #133 from tschaub/loader
Animated loading indicator
2017-06-23 17:46:05 +01:00
Orange Mug c74ef7b0d3 Merge pull request #134 from tschaub/close-open-dialog
Close the "open" dialog after choosing a new style
2017-06-23 17:38:07 +01:00
Orange Mug 23ef937100 Merge pull request #139 from tbarsballe/dynamic-arrays
Add DynamicArrayInput for handling variable-length array fields
2017-06-23 17:35:42 +01:00
Orange Mug 5157742009 Merge pull request #141 from tbarsballe/autocomplete-style
Improve autocomplete styling
2017-06-23 17:22:02 +01:00
Orange Mug 96d96edc9e Merge pull request #145 from bartvde/style-warning
Prevent warning for ColorField
2017-06-23 17:03:53 +01:00
Orange Mug 2a10edcc25 Merge pull request #144 from bartvde/babelrc
Move babel config out of package.json
2017-06-23 16:47:47 +01:00
bartvde e4477db413 Prevent warning for ColorField 2017-06-23 16:00:43 +02:00
bartvde b32d926b56 Move babel config out of package.json 2017-06-23 15:47:15 +02:00
Lukas Martinelli 6b3b5a8b6f Merge pull request #142 from tbarsballe/ol
Improved OpenLayers support
2017-06-09 13:19:36 -04:00
Tim Schaub a7df8afd6e Animated loading indicator 2017-06-02 15:12:21 -06:00
Tim Schaub b8205f4c38 Close the "open" dialog after choosing a new style 2017-06-02 15:11:29 -06:00
Torben Barsballe 2adb1bf917 Add DynamicArrayInput for handling variable-length array fields 2017-05-29 14:32:05 -07:00
Torben Barsballe 2825dd7e04 Improve autocomplete styling
Use "position: absolute" so that autocomplete follows the field when you scroll.
2017-05-29 13:22:50 -07:00
Torben Barsballe df04064e81 Improved OpenLayers support
Added support for gejson sources
Fix toVectorLayer map callback (this was undefined)
Improved ol css; show map controls
2017-05-29 13:18:09 -07:00
Lukas Martinelli 0555fc48ad Merge pull request #140 from tbarsballe/ci-fix
Update react-collapse to ^4.0.2
2017-05-26 14:10:53 -04:00
Torben Barsballe cd425bd26d Update react-collapse to ^4.0.2 2017-05-26 09:30:27 -07:00
Orange Mug a98444b4e7 Merge pull request #135 from orangemug/fix/react-height-peer-dep
Update react-height peer dependency version
2017-04-29 13:59:40 +01:00
orangemug 31d05cefbe Update react-height peer dependency version. 2017-04-28 18:39:56 +01:00
orangemug c552838fdd Merge remote-tracking branch 'upstream/master' into fix/issue-110-update-mapbox-style-spec
Conflicts:
	package.json
2017-04-13 08:26:25 +01:00
orangemug 45942e604b Updated @mapbox/mapbox-gl-style-spec to v9 2017-04-13 08:24:49 +01:00
Lukas Martinelli 9b1dd44b9d Merge pull request #128 from orangemug/feature/rtl-plugin-issue-126
Added @mapbox/mapbox-gl-rtl-text plugin
2017-04-11 16:42:17 -04:00
orangemug df56faa55a Added missing file-loader dep. 2017-04-11 20:54:12 +01:00
orangemug 14cdeae3eb Switch to using object urls so we don't need ajax for mapbox-gl-rtl-text plugin (issue #126) 2017-04-11 17:29:28 +01:00
orangemug f97d2b0e88 Added @mapbox/mapbox-gl-rtl-text plugin (fixes #126) 2017-04-11 08:18:29 +01:00
Lukas Martinelli a7e2154422 Merge pull request #127 from orangemug/fix/build-path
Fixed build path since move of webpack.config.* to ./config
2017-04-10 09:04:49 -05:00
orangemug d8e84d67da Revert to mapbox-gl 0.34 because of mapbox-gl-inspect. 2017-04-10 13:58:08 +01:00
orangemug c3174a0c72 Moved to using @mapbox/mapbox-gl-style-spec 2017-04-10 13:29:57 +01:00
orangemug 0b05284340 Fixed build path since move of webpack.config.* to ./config 2017-04-10 09:39:36 +01:00
orangemug ac8ae0da66 Merge branch 'master' into fix/issue-110-update-mapbox-style-spec 2017-04-08 22:41:26 +01:00
Lukas Martinelli 4517a8a36a Merge pull request #125 from orangemug/feature/ui-tests
Initial webdriver test
2017-04-05 14:11:06 -05:00
orangemug 8ba7eadcb9 Removed tests for node v5 2017-04-05 18:01:26 +01:00
orangemug 0700e5b05b Yet another attempt at the build matrix. 2017-04-05 14:13:16 +01:00
orangemug 3485b7bfb0 Fixed matrix typo. 2017-04-04 21:42:08 +01:00
orangemug c71c50a729 Also need os in yaml. 2017-04-04 20:21:14 +01:00
orangemug 2651ab891d Moved linux env into matrix. 2017-04-04 20:18:50 +01:00
orangemug 1e429550c6 Moved to mapbox-gl-inspect^1.2.3 2017-04-04 19:18:41 +01:00
orangemug 44e4ae3740 Added node 7 to appveyor and also installed windows-build-tools for odd nodejs versions (issue #125) 2017-04-04 18:58:03 +01:00
orangemug b1552248c3 Added C compiler for odd versions of node.js
See <https://github.com/laverdet/node-fibers/issues/333#issuecomment-282312238>
2017-04-04 18:29:15 +01:00
orangemug 5efd2caeb8 Added nodejs 7 to travis and updated to latest patch versions 2017-04-04 18:09:43 +01:00
orangemug bed012cb9c Updated web driver config. 2017-04-04 16:03:02 +01:00
orangemug 319d9024db Removed .runner-opts from gitignore 2017-04-04 15:53:37 +01:00
orangemug ff7e371404 Initial webdriver test. 2017-04-04 15:51:30 +01:00
orangemug d94ee2ba98 Merge remote-tracking branch 'upstream/master' into fix/issue-110-update-mapbox-style-spec 2017-04-04 08:57:33 +01:00
orangemug a112c29c21 Moved mapbox-gl-inspect to point at lukasmartinelli/mapbox-gl-inspect repo. 2017-04-04 08:55:45 +01:00
Lukas Martinelli c7d6734a26 Merge pull request #122 from orangemug/fix/issue-54
Fix to add error notice when uploading invalid JSON
2017-04-02 16:20:23 -04:00
orangemug 32aa8b0e1f Fix lint errors. 2017-04-02 18:42:27 +01:00
orangemug 6b22ba2707 Removed duplicate css rules. 2017-04-02 16:11:14 +01:00
orangemug 2400c8ed00 Clear error on modal toggle. 2017-04-02 16:02:57 +01:00
orangemug 396022e8ea Styling fixes for firefox. 2017-04-02 16:01:56 +01:00
orangemug 0d4449b9c2 Added css flexbox to modal to allow for a max-height. 2017-04-02 15:13:07 +01:00
Lukas Martinelli 32ac92f901 Merge pull request #105 from orangemug/fix/issue-89
Remove overflow hidden to allow modal to show in safari
2017-03-28 23:30:37 -04:00
Lukas Martinelli f70026b702 Merge pull request #119 from nyurik/nyurik-patch-1
Increase popup Z-index
2017-03-28 23:30:23 -04:00
Yuri Astrakhan 87acc3362d Increase popup Z-index
Per https://github.com/maputnik/editor/issues/118
2017-03-28 23:03:13 -04:00
Lukas Martinelli 732d231c78 Do not barf if glyphs url not set #113 2017-03-28 11:00:58 -04:00
orangemug a76ce64e1d Temp updated to fix peer dependency issue 2017-03-22 10:54:11 +00:00
orangemug 5433a4193b Move from mapbox-gl-style-spec -> mapbox-gl. 2017-03-22 10:36:20 +00:00
Lukas Martinelli 56f1e58df0 Upgrade to Mapbox GL 0.33 #108 2017-03-19 16:15:38 -04:00
Helge Fahrnberger d0c9db41ce Merge pull request #104 from orangemug/feature/issue-47
Added JSON linting (#47)
2017-03-15 15:22:34 +01:00
Helge Fahrnberger f162ffd9be Merge pull request #107 from orangemug/feature/layer-comments
Added layer comments via 'metadata.maputnik:comment' (issue #28)
2017-03-15 15:19:45 +01:00
orangemug decc390777 Fix to add error notice when uploading invalid JSON (issue #54) 2017-03-09 21:29:25 +00:00
orangemug ad8fa7563a Added JSON linting (fixes #47) 2017-03-08 21:35:19 +00:00
Lukas Martinelli 68859d279d Merge pull request #101 from orangemug/fix/issue-44
Alpha value slider fix (#44)
2017-03-07 10:12:17 -05:00
Lukas Martinelli 5792a531ce Merge pull request #102 from orangemug/feature/color-swatch
Added color swatch to color field
2017-03-07 10:07:02 -05:00
orangemug 03af10f850 Fixed maputnik-color-swatch size. 2017-03-07 13:02:09 +00:00
orangemug 2f059874aa Fixed css lint errors. 2017-03-07 12:59:08 +00:00
orangemug a53d7763ba Added layer comments via 'metadata.maputnik:comment' (issue #28) 2017-03-07 12:25:23 +00:00
orangemug eb526a6186 Remove overflow hidden to allow modal to show in safari (issue #89) 2017-03-07 10:47:46 +00:00
orangemug 6095f871ed Added color swatch to color field. 2017-03-07 10:17:45 +00:00
orangemug e3b4fe582b Fixed alpha value slider (fixes #44) 2017-03-07 09:59:11 +00:00
jirik bbf26a3f38 Update fontstacks URL according to https://github.com/klokantech/tileserver-gl/pull/104#issuecomment-274444087 2017-02-02 13:19:52 +01:00
Lukas Martinelli fd291490d0 Merge pull request #93 from albertov/toolbar-offset
Configurable toolbar top offset.
2017-01-26 23:18:17 +01:00
Lukas Martinelli 767d68d905 Replace 0px with 0 2017-01-26 21:12:05 +01:00
Alberto Valverde 32b18e9141 Configurable toolbar top offset.
For facilitate embeding in other apps.
2017-01-26 20:43:06 +01:00
Lukas Martinelli 5c286f8d96 Remove static fontstacks.json 2017-01-25 13:47:37 +01:00
Lukas Martinelli 404b53587f Special fontstacks.json handling for Tileserver GL 2017-01-25 13:46:46 +01:00
Lukas Martinelli e5fbe3b74a Collapse layer groups by default #66 2017-01-25 13:34:10 +01:00
Lukas Martinelli 3f262885ca Highlight selected layer more #62 2017-01-25 13:23:54 +01:00
Lukas Martinelli c837179f71 Clean up layer.scss 2017-01-25 13:23:29 +01:00
Lukas Martinelli 9a947658e2 Improve default property styling #92 2017-01-25 12:54:33 +01:00
Lukas Martinelli 2458d4b637 Show inspect tooltip only on click in map #90 2017-01-22 21:16:11 +01:00
Lukas Martinelli e4850805fb Fix default tileset of OpenMapTiles #88 2017-01-18 13:06:24 +01:00
Lukas Martinelli 3a15a3bb06 Show type of feature in popup 2017-01-18 10:03:15 +01:00
Lukas Martinelli 75ca1fa930 Deal with no metadata in style 2017-01-16 20:07:21 +01:00
Lukas Martinelli 377840ca24 Fix lint issues in _modal.scss 2017-01-16 16:34:55 +01:00
Lukas Martinelli 48e9589b58 Merge pull request #86 from klokantech/gist-preview
Gist preview & access token
2017-01-16 15:48:12 +01:00
Lukas Martinelli 11e9cef834 Improve styles and text 2017-01-16 15:43:52 +01:00
jirik 7e3aa09d3e Proview & Access Token logic when saving to Gist 2017-01-16 15:13:19 +01:00
jirik e3b7e002b4 Hypertext links are white instead of blue 2017-01-16 15:13:11 +01:00
jirik 3b7fb7ae75 Fix checkbox not showing status 2017-01-16 15:13:02 +01:00
jirik fab004cdfe StringInput fires change if state and props values do not match
Now it is also possible to call onChange listener if new value is empty string
2017-01-16 15:12:03 +01:00
Lukas Martinelli 07523c00f0 Point styles to master not gh-pages 2017-01-16 11:08:18 +01:00
Lukas Martinelli c15ac14f88 Bump version to v1.0.1 2017-01-16 10:14:59 +01:00
Lukas Martinelli 8f6006c19f Less opacity for default values #73 2017-01-15 17:10:38 +01:00
Lukas Martinelli 16bedcf5b1 Add minzoom and maxzoom block #77 2017-01-15 13:46:55 +01:00
Lukas Martinelli 05349d8ffe Convert filter value to number if possible #63 2017-01-15 13:39:40 +01:00
Lukas Martinelli a1e1895651 Deal specially with has operator #84 2017-01-15 10:42:59 +01:00
Lukas Martinelli a111599850 Save chang event on XYZ editor #85 2017-01-15 10:36:57 +01:00
Lukas Martinelli 121a95cee8 Move my key message up 2017-01-14 15:09:27 +01:00
Lukas Martinelli decd1f3ea2 Add tilezen style 2017-01-14 14:45:04 +01:00
Lukas Martinelli c632718324 Remove id from empty style to generate one 2017-01-14 14:41:13 +01:00
Lukas Martinelli 9509b59696 Add open Mapbox styles to gallery 2017-01-14 14:00:32 +01:00
Lukas Martinelli 24dc71344e Merge pull request #81 from maputnik/default-access-token
Default access token
2017-01-13 17:01:14 +01:00
Lukas Martinelli 82a11e4b98 Fix style download and strip metadata 2017-01-13 15:55:49 +01:00
Lukas Martinelli fc8665ed93 Support fallback tokens and replace key 2017-01-13 15:33:22 +01:00
Lukas Martinelli ca9424e23d Remove interactive from style for diffing to work 2017-01-13 15:31:08 +01:00
Lukas Martinelli 99856b1bb3 Update README.md 2017-01-13 14:40:02 +01:00
Lukas Martinelli fb518c2be5 Add sponsor logos 2017-01-13 14:12:26 +01:00
Lukas Martinelli 1248a53029 Update README.md 2017-01-13 14:08:22 +01:00
Lukas Martinelli 6ce43840e5 Update README.md 2017-01-13 10:18:20 +01:00
Lukas Martinelli 41d9fb1c44 Newest Mapbox GL Inspect plugin for less fidly selecting 2017-01-12 22:54:20 +01:00
Lukas Martinelli fd9be8f08f Merge pull request #78 from klokantech/export
Export to Gist anonymously, related to maputnik/editor#3
2017-01-12 22:49:49 +01:00
jirik 69a665373f Export to Gist anonymously, related to maputnik/editor#3 2017-01-12 18:27:44 +01:00
Helge Fahrnberger 8c2b110115 Merge pull request #76 from maputnik/property-groups-reorder
Move line-dasharray to correct group
2017-01-12 18:15:49 +01:00
Helge Fahrnberger 5e3b2dd0df Merge branch 'master' into property-groups-reorder 2017-01-12 18:14:25 +01:00
Helge Fahrnberger d045213fa3 Move line-dasharray to correct group 2017-01-12 18:13:15 +01:00
Lukas Martinelli 63bba67750 Merge pull request #71 from maputnik/property-groups-reorder
Reordered and renamed groups
2017-01-12 17:47:34 +01:00
Helge Fahrnberger 52e8fd2c29 Add missing properties 2017-01-12 17:44:56 +01:00
Lukas Martinelli 5479b240e1 Fix empty field causing exceptions 2017-01-12 17:28:45 +01:00
Lukas Martinelli f209d8e9a5 Fix layout.json quote tokens 2017-01-12 17:01:30 +01:00
Lukas Martinelli ac40d7727e Fix popup layer issue 2017-01-12 16:59:38 +01:00
Lukas Martinelli 7bd9d3f5da Remove GeoJSON example from tilesets 2017-01-12 16:59:38 +01:00
Lukas Martinelli 68685dcf42 Only set source layer if not undefined 2017-01-12 16:59:38 +01:00
jirik 6be6db8f5e Fix hidden map attributions (CSS issue) 2017-01-12 15:34:38 +01:00
Helge Fahrnberger 236dd79b85 Reordered and renamed groups
Purpose: Match structure and wording with Mapbox GL style spec.
2017-01-12 14:31:26 +01:00
Lukas Martinelli 7d905c5e06 Update dependencies 2017-01-12 11:50:08 +01:00
Lukas Martinelli 6fa2542b56 Fix color of compound filter 2017-01-12 11:35:11 +01:00
Lukas Martinelli 7627b8fb45 Fix empty style url in config 2017-01-12 11:33:46 +01:00
Lukas Martinelli 5901427534 Move empty style to config dir 2017-01-12 11:32:20 +01:00
Lukas Martinelli a30e57c4d8 Add empty style option 2017-01-12 11:31:16 +01:00
Lukas Martinelli 69f2e12ea0 Add stylelint and fix lint issues 2017-01-12 11:23:06 +01:00
Lukas Martinelli 93c7f323fc Upgrade Mapbox GL inspect and remove unused lodash 2017-01-12 10:44:44 +01:00
Lukas Martinelli cbe2a4c180 Fix GeoJSON and default source issue in Sources modal 2017-01-12 10:28:03 +01:00
Lukas Martinelli 2e0cc4511c Improve add layer button visually 2017-01-11 20:48:15 +01:00
Lukas Martinelli bcab165f97 Select highlighted multibutton 2017-01-11 20:43:40 +01:00
Lukas Martinelli 2516fba105 Animate opacity on layer group collapse 2017-01-11 19:57:12 +01:00
Lukas Martinelli 9ca8760564 Absolute position to not take up space 2017-01-11 19:50:18 +01:00
Lukas Martinelli df94d9c842 Prevent same prefix from being collapsed 2017-01-11 19:39:09 +01:00
Lukas Martinelli abceb457c9 Collapsible layer groups #66 2017-01-11 18:18:59 +01:00
Lukas Martinelli 26a865bb50 Add missing mixins 2017-01-11 17:52:29 +01:00
Lukas Martinelli d0f047d88a Group layers #66 2017-01-11 17:52:21 +01:00
Lukas Martinelli 76d2d06e77 Make section headers white #64 2017-01-11 16:32:31 +01:00
Lukas Martinelli 6c56006fbf Show choose public sources first #64 2017-01-11 16:26:14 +01:00
Lukas Martinelli bbe45cf8ee Switch text in inspect button #64 2017-01-11 16:23:33 +01:00
Lukas Martinelli 82da251218 Add vendor prefixes 2017-01-11 16:20:10 +01:00
Lukas Martinelli 196d9f0a10 Move add modal to layer list 2017-01-11 15:59:51 +01:00
Lukas Martinelli cb752c0343 Add layer button and increase contrast 2017-01-11 15:48:15 +01:00
Lukas Martinelli 3917a3e323 Fix multi button style 2017-01-11 14:13:23 +01:00
Lukas Martinelli fed1f09434 Remove last style configs in JS 2017-01-11 14:11:45 +01:00
Lukas Martinelli 840778b64f Remove JS input config 2017-01-11 14:03:48 +01:00
Lukas Martinelli 0908856b4f Restructure CSS more 2017-01-11 13:34:38 +01:00
Lukas Martinelli b51354ae1d All important stuff is in CSS now 2017-01-11 11:35:33 +01:00
Lukas Martinelli 9ef24428fe Style open modal 2017-01-11 09:35:48 +01:00
Lukas Martinelli 4a75b0381b Move style code to CSS 2017-01-10 21:28:30 +01:00
Lukas Martinelli 2426117233 Tweaked colors #64 2017-01-10 19:41:39 +01:00
Lukas Martinelli d40c704c69 Upgrade mapbox-gl-inspect to v1.0.9 2017-01-10 19:27:27 +01:00
Lukas Martinelli cb4fdb0f9f Remove rasters in inspect style 2017-01-10 19:14:14 +01:00
Lukas Martinelli f0d04bdb07 Prepare version for release 2017-01-10 19:14:06 +01:00
Lukas Martinelli df61ae8c7a Add filter button on the right bottom 2017-01-10 19:02:06 +01:00
Lukas Martinelli 2ff8ec07bb Update style thumbs 2017-01-10 18:42:22 +01:00
Lukas Martinelli 6021b51385 Extra padding prevents hidden layers #61 2017-01-10 15:53:22 +01:00
Lukas Martinelli 40111e0d8e Fix minzoom and maxzoom in source modal 2017-01-10 15:35:13 +01:00
Lukas Martinelli 43d9440e05 White background for OL3 2017-01-10 14:32:45 +01:00
Lukas Martinelli 3a3e90c3dc Support TileJSON sources for OL3 2017-01-10 14:24:35 +01:00
Lukas Martinelli 104d6311ec Add missing IconInput 2017-01-10 14:05:46 +01:00
Lukas Martinelli f5256cf80a Add missing metadata lib 2017-01-10 14:05:36 +01:00
Lukas Martinelli b470885263 Use first vector source for OL3 2017-01-10 14:05:25 +01:00
Lukas Martinelli 7ff0ac9bb5 Upgrade ol-mapbox-style to v0.14 2017-01-10 12:04:19 +01:00
Lukas Martinelli 0fb59ca544 Load icon and font metadata from endpoint 2017-01-10 11:13:53 +01:00
Lukas Martinelli 09b6b2dffe Add Roboto Medium for groups #51 2017-01-10 10:06:49 +01:00
Lukas Martinelli a8a3b7a5ad Always have default value if value not set 2017-01-10 09:51:18 +01:00
Lukas Martinelli 766a3e387e Fix many React warnings 2017-01-10 09:38:27 +01:00
Lukas Martinelli ec9fc8f6ad Allow passing elems to DocLabel 2017-01-09 23:06:55 +01:00
Lukas Martinelli 0f272e233b Rename to FeatureLayerPopup 2017-01-09 23:04:08 +01:00
Lukas Martinelli f806e797fa Fix non existing value warning 2017-01-09 23:02:17 +01:00
Lukas Martinelli cff0a15f7e Show hint when hovering over function icon 2017-01-09 22:54:30 +01:00
Lukas Martinelli d3276829b2 Show hints in the source modal as well 2017-01-09 22:44:22 +01:00
Lukas Martinelli a3caf8499c Add DocLabel to settings modal 2017-01-09 22:37:21 +01:00
Lukas Martinelli d739ca812c No source blocks for background layer 2017-01-09 22:27:54 +01:00
Lukas Martinelli cb89ca6ef7 Show text when nested filter 2017-01-09 22:20:28 +01:00
Lukas Martinelli c3417241f1 Ensure zoom icon is nice 2017-01-09 22:09:15 +01:00
Lukas Martinelli 5d70de6202 Center checkbox 2017-01-09 21:43:14 +01:00
Lukas Martinelli c09ffc9d41 Tweak margins to realign 2017-01-09 21:39:35 +01:00
Lukas Martinelli e19a41d015 Change filter layout again 2017-01-09 21:30:49 +01:00
Lukas Martinelli 0a0400a297 Rearrange and simplify filter layout 2017-01-09 21:07:51 +01:00
Lukas Martinelli 153232c143 Add filter editor block 2017-01-09 20:07:48 +01:00
Lukas Martinelli 7e8813f417 Split filter editor into component per file 2017-01-09 18:56:04 +01:00
Lukas Martinelli b72f86a78d Improve grouping 2017-01-09 18:43:04 +01:00
Lukas Martinelli fed530f5f2 Filter out combining operator select 2017-01-09 17:47:35 +01:00
Lukas Martinelli ba0a94f3ad Use DocLabel in input block 2017-01-09 16:45:59 +01:00
Lukas Martinelli d9b458d7fd Add label to filter editor 2017-01-09 16:40:09 +01:00
Lukas Martinelli ed9b806143 Add filter item 2017-01-09 16:33:26 +01:00
Lukas Martinelli 5bb68a38c2 Support delete filter 2017-01-09 16:24:42 +01:00
Lukas Martinelli cfeaf2cdce Support turning property into zoom func #52 2017-01-09 16:08:22 +01:00
Lukas Martinelli 887b23ce1f Merge pull request #59 from maputnik/switch_gl_inspect
Switch to Mapbox GL Inspect
2017-01-09 12:04:26 +01:00
Lukas Martinelli f227392f9b Upgrade inspect to v1.0.7 2017-01-09 12:03:47 +01:00
Lukas Martinelli 2f7658e245 Only increase stack size in travis build 2017-01-09 11:39:52 +01:00
Lukas Martinelli 4f0c641eb0 Upgrade inspect 2017-01-09 00:08:50 +01:00
Lukas Martinelli 1538f2e174 Get highlight working 2017-01-08 23:19:21 +01:00
Lukas Martinelli 580068bf63 Show popup also on normal map 2017-01-08 22:44:25 +01:00
Lukas Martinelli 91604afccb Ensure style updates are applied after inspect 2017-01-08 22:16:45 +01:00
Lukas Martinelli c363c88f23 Use Mapbox GL Inspect 2017-01-08 22:03:21 +01:00
Lukas Martinelli e9daee4470 Add raster layout group 2017-01-08 19:58:19 +01:00
Lukas Martinelli 118f0360d0 Hide source layer for raster source 2017-01-08 19:47:43 +01:00
Lukas Martinelli 7c9dcb3083 Refactor sources modal 2017-01-08 19:45:44 +01:00
Lukas Martinelli 7c3906fa40 Add raster XYZ and TileJSON options #57 2017-01-08 18:50:32 +01:00
Lukas Martinelli 7b24cbf39b Increase stack size in node 2017-01-08 17:15:35 +01:00
Lukas Martinelli e7b11d8bc9 Ensure editor does not crash with raster layers 2017-01-08 17:15:35 +01:00
Lukas Martinelli 08854cd88f Merge pull request #55 from klokantech/format
Format style on download
2017-01-06 16:53:20 +01:00
jirik cb46ac5421 Format style on download 2017-01-06 15:48:57 +01:00
Lukas Martinelli c9fd00e2ed Update README.md 2017-01-06 09:53:57 +01:00
Lukas Martinelli 7c23fe3646 Open style from url #34 2017-01-05 19:34:53 +01:00
Lukas Martinelli 56aacb0149 Do not generate created timestamp 2017-01-05 19:34:53 +01:00
Helge Fahrnberger 12411ee886 Linked myself 2017-01-04 20:26:04 +01:00
Lukas Martinelli 85cef2945d StringInput triggers change on out of focus #46 2017-01-04 12:06:55 +01:00
Lukas Martinelli a1dfeca6e0 Keep existing metadata when toggling inspection #45 2017-01-04 12:00:00 +01:00
Lukas Martinelli 3be6d14637 No dropping of console 2017-01-04 12:00:00 +01:00
Lukas Martinelli 74b3ef9e88 Do not set modified date when saving 2017-01-04 12:00:00 +01:00
Lukas Martinelli 019dfe9f8a Update README.md 2017-01-01 22:29:22 +01:00
Lukas Martinelli e92dfd8284 Fix local update to right this 2017-01-01 15:51:22 +01:00
Lukas Martinelli fa38667125 Only init websocket if local API 2017-01-01 15:12:46 +01:00
Lukas Martinelli ce39ae723c Add support local Maputnik 2017-01-01 14:49:32 +01:00
Lukas Martinelli 99acbd4d92 Ensure GeoJSON styling works 2016-12-31 15:15:28 +01:00
Lukas Martinelli b0e9790382 Support updating of ArrayInput #39 2016-12-31 14:56:26 +01:00
Lukas Martinelli e00cdde3af Reset JSONEditor after it loosed focus 2016-12-31 14:37:40 +01:00
Lukas Martinelli c3a634b216 Show undo/redo message 2016-12-31 14:32:04 +01:00
Lukas Martinelli 4f26a521a0 Fix margins in source editing area 2016-12-31 14:02:14 +01:00
Lukas Martinelli ca6b48843c Support adding, editing and removing stops 2016-12-31 13:42:25 +01:00
Lukas Martinelli 0eb00312f4 Restyle to use border box 2016-12-31 12:17:02 +01:00
Lukas Martinelli e7709dae15 Notice for not supported nested filter 2016-12-31 11:08:14 +01:00
Lukas Martinelli 03796c963b Fix React type warnings 2016-12-31 10:39:30 +01:00
Lukas Martinelli b50855a4a9 Restructure webpack and add favico 2016-12-31 10:36:02 +01:00
Lukas Martinelli 24a90b3c57 Set dark scrollbar globally 2016-12-30 21:02:39 +01:00
Lukas Martinelli cf80e80025 Switch font input to AutocompleteInput 2016-12-30 20:53:12 +01:00
Lukas Martinelli 48f10bcb73 Convert Autocmplete from tabs to spaces 2016-12-30 20:46:27 +01:00
Lukas Martinelli 7bc2323401 Introduce AutocompelteInput for source editing 2016-12-30 20:38:50 +01:00
Lukas Martinelli a71ac502d6 Remove style from PropertyGroup 2016-12-30 20:01:14 +01:00
Lukas Martinelli f2dd785e7b Simplify font stacks and limit to one default value 2016-12-30 18:56:16 +01:00
Lukas Martinelli 0b99e571c4 Prototype FontInput field 2016-12-30 18:13:41 +01:00
Lukas Martinelli cfc6085718 Add missing properties to symbol layer 2016-12-30 17:17:08 +01:00
Lukas Martinelli 384b2d4bea Show default value in color field 2016-12-30 17:16:58 +01:00
Lukas Martinelli 1058dbfb5a Hide sources when adding background layer 2016-12-30 17:06:08 +01:00
Lukas Martinelli bda7ce7390 Move change property logic to lib 2016-12-30 16:56:20 +01:00
Lukas Martinelli 7b631b0510 Garbage collect properties when change type #42 2016-12-30 16:47:47 +01:00
Lukas Martinelli 1d7768e37c Make NumberInput more tolerant to errors 2016-12-30 16:18:57 +01:00
Lukas Martinelli 89d497c73f Error panel with current map style errors #40 2016-12-30 13:21:03 +01:00
Lukas Martinelli 886c87f231 Improve groups for symbol layer 2016-12-29 23:01:31 +01:00
Lukas Martinelli d567a4f98b Add support for circle layer #30 2016-12-29 22:58:36 +01:00
Lukas Martinelli 5eb0e36faf Decrease doc label font size 2016-12-29 22:41:39 +01:00
Lukas Martinelli 51a2eabc91 Add ArrayInput 2016-12-29 22:37:54 +01:00
Lukas Martinelli 007bdad70a Also show MultiButton for 3 options 2016-12-29 22:12:36 +01:00
Lukas Martinelli 1f1a919c77 Only update style if it is valid 2016-12-29 22:00:49 +01:00
Lukas Martinelli 3be3a716d4 Only update if structure of JSON changes 2016-12-29 21:49:40 +01:00
Lukas Martinelli ae9afdd8d9 Replace gone style store test with sample 2016-12-29 17:40:12 +01:00
Lukas Martinelli a5307054b3 Fix setting style properties in settings modal 2016-12-29 17:32:23 +01:00
Lukas Martinelli d16c3f4356 Always show all features in inspect mode 2016-12-29 17:30:01 +01:00
Lukas Martinelli 853361ace7 Indicate if feature is clickable 2016-12-29 17:00:36 +01:00
Lukas Martinelli e41e1eb2f1 Inspection map is now always aware of current layer 2016-12-29 16:54:58 +01:00
Lukas Martinelli e36c233b49 Remove highlighted layer from metadata in style 2016-12-29 15:51:11 +01:00
Lukas Martinelli d1b8f8d63e Change map style to add layer 2016-12-29 15:35:07 +01:00
Lukas Martinelli 29cfb58a56 Update sources if they change 2016-12-29 15:22:47 +01:00
Lukas Martinelli bf5131cadd Restructure layer settings for add modal 2016-12-29 14:46:04 +01:00
Lukas Martinelli ccc39b87db Move storing access token into style metadata 2016-12-28 21:50:53 +01:00
Lukas Martinelli 604be38b7c Store highlighted layer in metadata 2016-12-28 21:50:53 +01:00
Lukas Martinelli 160bd9563b Introduce MultiInputButton 2016-12-28 21:50:53 +01:00
Lukas Martinelli 488fdf2bd5 Rename icons and add layer to toolbar 2016-12-28 21:50:53 +01:00
Lukas Martinelli a0e1e6152b Merge pull request #36 from PetersonGIS/upgrade-mapboxgl
Upgraded reference to mapbox-gl to v0.29.0 to follow their latest webpack recommendations and support Windows dev. This is addressed in mapbox/mapbox-gl-js#3724
2016-12-28 21:46:11 +01:00
PetersonGIS 58897f1856 Upgraded reference to mapbox-gl to v0.29.0 to follow their latest webpack recommendations and support Windows dev. This is addressed in mapbox/mapbox-gl-js#3724 2016-12-28 11:10:27 -07:00
Lukas Martinelli 80678af691 Implement adding public and custom sources 2016-12-28 15:57:30 +01:00
Lukas Martinelli ba271e1fc6 Allow deleting active source 2016-12-28 15:20:07 +01:00
Lukas Martinelli c7ac90ba15 Fill extrusion support #31 2016-12-27 12:04:36 +01:00
Lukas Martinelli 0dc335ea5f Deref style on open 2016-12-26 12:21:41 +01:00
Lukas Martinelli acac314d27 Improve input styling (it is still hacky) 2016-12-26 12:03:12 +01:00
Lukas Martinelli 916c1dc9fc No scrollbar style for JSON mode 2016-12-26 11:55:39 +01:00
Lukas Martinelli c159f7041f Switch from field components to input components 2016-12-26 11:51:26 +01:00
Lukas Martinelli a3d586a75d Give more space to layer editor 2016-12-26 11:22:41 +01:00
Lukas Martinelli 6b0b29d1da Increase font size to 12px 2016-12-25 20:36:10 +01:00
Lukas Martinelli 8afda2fe28 Adapt Mapbox GL css icon colors 2016-12-25 20:26:59 +01:00
Lukas Martinelli beb1a2a8d1 Introduce doc label for help 2016-12-25 19:00:21 +01:00
Lukas Martinelli 436e0c2095 Hack together add and delete button for stops 2016-12-25 18:30:23 +01:00
Lukas Martinelli e1bc2a321a Improve inspect popups 2016-12-25 17:46:18 +01:00
Lukas Martinelli 720c8f108b Add codemirror as dependency 2016-12-25 13:19:33 +01:00
Lukas Martinelli 4db5c7cf68 Better inspection hover 2016-12-24 22:57:14 +01:00
Lukas Martinelli 8f561d8a27 Show layer table 2016-12-24 22:57:14 +01:00
Lukas Martinelli 0c483cffe3 Allow hash for location 2016-12-24 22:57:14 +01:00
Lukas Martinelli def5ebb587 Show feature table on hover 2016-12-24 22:57:14 +01:00
Lukas Martinelli 6e9e66b147 Switch renderer with inspect mode 2016-12-24 22:57:14 +01:00
Lukas Martinelli f332d517f3 Add inspection map 2016-12-24 22:57:14 +01:00
Lukas Martinelli 04eab70e27 Add missing revision store 2016-12-24 22:57:14 +01:00
Lukas Martinelli cfbcdc7fa1 Basic redo/undo with keybindings #25 2016-12-24 22:57:14 +01:00
Lukas Martinelli c95dd75e2a Update README.md 2016-12-22 23:16:51 +01:00
Lukas Martinelli 4408f3ab3b Update README.md 2016-12-22 23:09:42 +01:00
103 changed files with 1131 additions and 4200 deletions
-14
View File
@@ -1,14 +0,0 @@
root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,jsx,html,sass}]
charset = utf-8
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
-30
View File
@@ -1,30 +0,0 @@
# Logs
logs
*.log
# Runtime data
pids
*.pid
*.seed
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# node-waf configuration
.lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules
# Ignore build files
public
View File
-21
View File
@@ -1,21 +0,0 @@
language: node_js
addons:
firefox: latest
os:
- linux
- osx
node_js:
- "4.6"
- "5.11"
- "6.1"
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
install:
- npm install
script:
- mkdir public
- npm run build
- npm run lint
- npm run test
-15
View File
@@ -1,15 +0,0 @@
FROM nodesource/xenial:6.1.0
EXPOSE 8888
ENV HOME /maputnik
RUN mkdir ${HOME}
COPY . ${HOME}/
WORKDIR ${HOME}
RUN npm install -d --dev
RUN npm run build
CMD npm run start -- --host 0.0.0.0
-22
View File
@@ -1,22 +0,0 @@
The MIT License (MIT)
Copyright (c) 2015 Lukas Martinelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-154
View File
@@ -1,154 +0,0 @@
# Maputnik [![Build Status](https://travis-ci.org/maputnik/editor.svg?branch=master)](https://travis-ci.org/maputnik/editor) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/anelbgv6jdb3qnh9/branch/master?svg=true)](https://ci.appveyor.com/project/lukasmartinelli/editor) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://tldrlegal.com/license/mit-license)
<img width="200" align="right" alt="Maputnik" src="media/maputnik.png" />
A free and open visual editor for the [Mapbox GL styles](https://www.mapbox.com/mapbox-gl-style-spec/)
targeted at developers and map designers. Creating your own custom map is easy with **Maputnik**.
*Maputnik is an early prototype and is under development.
[Thanks to the supporters of the Kickstarter campaign who made this project possible](https://www.kickstarter.com/projects/174808720/maputnik-visual-map-editor-for-mapbox-gl)*.
## Features
- [x] Completely free and open source
- [x] Visual interface for designing maps
- [x] Immediate feedback (thanks to [style diffs](https://github.com/mapbox/mapbox-gl-style-spec/blob/mb-pages/lib/diff.js))
- [x] Edit layers
- [x] Easy to deploy as single HTML file
- [ ] Support for Open Layers 3
![Demo showing interactive feedback](media/demo.gif)
## Develop
Maputnik is written in ES6 and is using [React](https://github.com/facebook/react), [Immutable.js](https://facebook.github.io/immutable-js/) and [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
We ensure building and developing Maputnik works with
- Linux, OSX and Windows
- Node >4
Install the deps, start the dev server and open the web browser on `http://localhost:8888/`.
```bash
# install dependencies
npm install
# start dev server
npm start
```
Build a production package for distribution.
```
npm run build
```
Lint the JavaScript code.
```
# install lint dependencies
npm install --save-dev eslint eslint-plugin-react
# run linter
npm run lint
```
## Docker
Start a container using the official Docker image.
```
docker run --name maputnik -p 8888:8888 -d maputnik/editor
```
Stop the container
```
docker stop maputnik
```
## Sponsors
This project would not be possible without commercial and individual sponsors.
### Gold
[![Wemap](media/sponsors/wemap.jpg)](https://getwemap.com/)
[![Terranodo](media/sponsors/terranodo.png)](http://terranodo.io/)
### Silver
<a href="https://www.klokantech.com/">
<img alt="Klokan Technologies" style="display:inline" src="media/sponsors/klokantech.png" />
</a>
<a href="https://www.dreipol.ch/">
<img alt="Dreipol" style="display:inline" src="media/sponsors/dreipol.png" />
</a>
<br/>
### Individuals
**Influential Stakeholder**
- Alan McConchie
- Odi
- Mats Norén
- Uli [geOps](http://geops.ch/)
- Helge Fahrnberger
Kirusanth Poopalasingam
**Stakeholder**
- Brian Flood
- Vasile Coțovanu
- Andreas Kalkbrenner
- Christian Mäder
- Gregor Wassmann
- Lee Armstrong
- Rafel
- Jon Burgess
- Lukas Lehmann
- Joachim Ungar
- Alois Ackermann
- Zsolt Ero
- Jordan Meek
**Supporter**
- Sina Martinelli
- Nicholas Doiron
- Neil Cawse
- Urs42
- Benedikt Groß
- Manuel Roth
- Janko Mihelić
- Moritz Stefaner
- Sebastian Ahoi
- Juerg Uhlmann
- Tom Wider
- Nadia Panchaud
- Oliver Snowden
- Stephan Heuel
- Tobin Bradley
- Adrian Herzog
- Antti Lehto
- Pascal Mages
- Marc Gehling
- Imre Samu
- Lauri K.
- Visahavel Parthasarathy
- Christophe Waterlot-Buisine
- Max Galka
- ubahnverleih
- Wouter van Dam
- Jakob Lobensteiner
- Samuel Kurath
- Brian Bancroft
## License
Maputnik is [licensed under MIT](LICENSE) and is Copyright (c) Lukas Martinelli and contributors.
**Disclaimer** This project is not affiliated with Mapbox or Mapbox Studio. It is a independent style editor for the
open source technology in the Mapbox GL ecosystem.
As contributor please take extra care of not violating any Mapbox trademarks. Do not get inspired by Mapbox Studio and make your own decisions for a good style editor.
-14
View File
@@ -1,14 +0,0 @@
environment:
matrix:
- nodejs_version: "4.6"
- nodejs_version: "5.11"
- nodejs_version: "6.1"
install:
- ps: Install-Product node $env:nodejs_version
- md public
- npm install
build_script:
- npm run build
test_script:
- npm run lint
- npm test
Binary file not shown.
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+9
View File
@@ -0,0 +1,9 @@
{
"name": "Maputnik",
"short_name": "Maputnik",
"description": "Visual Map Designer",
"start_url": ".",
"display": "browser",
"background_color": "#1c1f24",
"theme_color": "#1c1f24"
}
+2
View File
@@ -0,0 +1,2 @@
const e={"Drag and drop a style JSON file here or click to browse":"Drag and drop a style JSON file here or click to browse"};export{e as default};
//# sourceMappingURL=translation-BGNHuhFm.js.map
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-BGNHuhFm.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-By0N8Bv5.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-C9ujdbWm.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-CZCLjgpE.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-CcF6vdbg.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-CniVGPpK.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-DErdfNS6.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-a6aNEnxv.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
File diff suppressed because one or more lines are too long
+1
View File
@@ -0,0 +1 @@
{"version":3,"file":"translation-xtrlBNbA.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
+133
View File
@@ -0,0 +1,133 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Maputnik</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="manifest" href="/maputnik/assets/manifest-BrZzkYP9.json">
<link rel="icon" href="/maputnik/assets/favicon-DBn6BKLx.ico" type="image/x-icon" />
<style>
html {
background-color: rgb(28, 31, 36);
}
.loading {
text-align: center;
position: absolute;
width: 100vw;
height: 100vh;
top: 0;
left: 0;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.loading__logo img {
width: 200px;
height: 200px;
}
.loading__text {
font-family: sans-serif;
color: white;
font-size: 1.2em;
padding-bottom: 2em;
}
</style>
<script type="module" crossorigin src="/maputnik/assets/index-BECDTzeS.js"></script>
<link rel="stylesheet" crossorigin href="/maputnik/assets/index-CeR5SWEc.css">
</head>
<body>
<!-- From <https://github.com/hail2u/color-blindness-emulation> -->
<svg
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
version="1.1">
<defs>
<filter id="protanopia">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.567, 0.433, 0, 0, 0
0.558, 0.442, 0, 0, 0
0, 0.242, 0.758, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="protanomaly">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.817, 0.183, 0, 0, 0
0.333, 0.667, 0, 0, 0
0, 0.125, 0.875, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="deuteranopia">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.625, 0.375, 0, 0, 0
0.7, 0.3, 0, 0, 0
0, 0.3, 0.7, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="deuteranomaly">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.8, 0.2, 0, 0, 0
0.258, 0.742, 0, 0, 0
0, 0.142, 0.858, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="tritanopia">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.95, 0.05, 0, 0, 0
0, 0.433, 0.567, 0, 0
0, 0.475, 0.525, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="tritanomaly">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.967, 0.033, 0, 0, 0
0, 0.733, 0.267, 0, 0
0, 0.183, 0.817, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="achromatopsia">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.299, 0.587, 0.114, 0, 0
0.299, 0.587, 0.114, 0, 0
0.299, 0.587, 0.114, 0, 0
0, 0, 0, 1, 0"/>
</filter>
<filter id="achromatomaly">
<feColorMatrix
in="SourceGraphic"
type="matrix"
values="0.618, 0.320, 0.062, 0, 0
0.163, 0.775, 0.062, 0, 0
0.163, 0.320, 0.516, 0, 0
0, 0, 0, 1, 0"/>
</filter>
</defs>
</svg>
<div id="app"></div>
<div class="loading">
<div class="loading__logo">
<img inline src="data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='1200'%20height='1200'%20viewBox='0%200%20100%20100'%3e%3cstyle%3e@keyframes%20circle-anim{0%25,40%25{fill-opacity:0}60%25,to{fill-opacity:1}}.circle0,.circle1,.circle2,.circle3,.circle4,.circle5{stroke-opacity:0;animation-name:circle-anim;will-change:transform;animation-timing-function:east-in-out;animation-duration:800ms;animation-iteration-count:infinite;animation-direction:alternate}.circle0{animation-delay:100ms}.circle1{animation-delay:200ms}.circle2{animation-delay:300ms}.circle3{animation-delay:400ms}.circle4{animation-delay:500ms}.circle5{animation-delay:600ms}%3c/style%3e%3cg%20class='map'%20stroke='%23000'%3e%3cuse%20xlink:href='%23ref-1--map__main'%20fill='%234eba6f'%3e%3c/use%3e%3cuse%20xlink:href='%23ref-1--map__line1'%20fill='none'%3e%3c/use%3e%3cuse%20xlink:href='%23ref-1--map__line2'%20fill='none'%3e%3c/use%3e%3cuse%20xlink:href='%23ref-1--map__line3'%20fill='none'%3e%3c/use%3e%3c/g%3e%3cg%20class='palette'%3e%3cuse%20xlink:href='%23ref-1--palette__main'%20fill='%23fff'%20stroke='%23000'%3e%3c/use%3e%3cuse%20xlink:href='%23ref-1--palette__inner'%20fill='none'%20stroke='%23000'%3e%3c/use%3e%3cuse%20class='circle5'%20xlink:href='%23ref-1--palette__circle5'%20fill='%23f7c44c'%3e%3c/use%3e%3cuse%20class='circle4'%20xlink:href='%23ref-1--palette__circle4'%20fill='%234eba6f'%3e%3c/use%3e%3cuse%20class='circle3'%20xlink:href='%23ref-1--palette__circle3'%20fill='%23f7c44c'%3e%3c/use%3e%3cuse%20class='circle2'%20xlink:href='%23ref-1--palette__circle2'%20fill='%234eba6f'%3e%3c/use%3e%3cuse%20class='circle1'%20xlink:href='%23ref-1--palette__circle1'%20fill='%23f7c44c'%3e%3c/use%3e%3cuse%20class='circle0'%20xlink:href='%23ref-1--palette__circle0'%20fill='%234eba6f'%3e%3c/use%3e%3c/g%3e%3cg%20class='brush'%20stroke='%23000'%3e%3cuse%20xlink:href='%23ref-1--brush__bottom'%20fill='%23f7c44c'%3e%3c/use%3e%3cuse%20xlink:href='%23ref-1--brush__top'%20fill='%23fff'%3e%3c/use%3e%3c/g%3e%3cdefs%3e%3cpath%20id='ref-1--map__main'%20stroke-width='2.366'%20stroke-linejoin='round'%20d='M18.84%207.717l15.44%207.542%2015.75-7.762%2015.7%207.857L81.005%207.67%2096.31%2054.052%2073.598%2062.12%2050.93%2053.872l-25.1%208.066-22.668-8.066z'%3e%3c/path%3e%3cpath%20id='ref-1--map__line1'%20d='M65.556%2015.07l7.647%2046.838'%20stroke-width='1.104'%3e%3c/path%3e%3cpath%20id='ref-1--map__line2'%20d='M50.261%207.422l.717%2046.6'%20stroke-width='1.104'%3e%3c/path%3e%3cpath%20id='ref-1--map__line3'%20d='M34.011%2015.07l-8.603%2046.6'%20stroke-width='1.104'%3e%3c/path%3e%3cpath%20id='ref-1--palette__main'%20stroke-width='2.3'%20d='M47.352%2030.887c7.993.226%2016.934%209.725%2017.954%2015.25%201.02%205.527-.743%2011.125-4.298%2013.875-3.554%202.75-8.6%202.905-8.723%208.302-.097%204.237%208.457%208.5%208.088%2015.653-.406%207.857-15.508%2013.15-30.943%206.102-8.556-3.906-14.249-13.653-13.385-26.238C16.833%2052.334%2022.32%2043.658%2027.382%2039c5.977-5.503%2011.977-8.337%2019.97-8.112z'%3e%3c/path%3e%3ccircle%20id='ref-1--palette__inner'%20stroke-width='2.3'%20cx='41.873'%20cy='61.901'%20r='6.389'%3e%3c/circle%3e%3ccircle%20id='ref-1--palette__circle5'%20cy='44.56'%20cx='54.347'%20r='4.336'%3e%3c/circle%3e%3ccircle%20id='ref-1--palette__circle4'%20cx='40.443'%20cy='41.555'%20r='4.336'%3e%3c/circle%3e%3ccircle%20id='ref-1--palette__circle3'%20r='4.336'%20cy='51.102'%20cx='29.651'%3e%3c/circle%3e%3ccircle%20id='ref-1--palette__circle2'%20cx='25.293'%20cy='65.836'%20r='4.336'%3e%3c/circle%3e%3ccircle%20id='ref-1--palette__circle1'%20r='4.336'%20cy='79.326'%20cx='32.764'%3e%3c/circle%3e%3ccircle%20id='ref-1--palette__circle0'%20cx='46.669'%20cy='80.571'%20r='4.336'%3e%3c/circle%3e%3cpath%20id='ref-1--brush__bottom'%20d='M76.333%2089.333c-1.645-9.794-4.375-35.26-4.32-37.887.056-2.627%202.52-4.34%205.36-4.317%202.842.022%205.098%201.87%205.314%204.27.107%201.2-1.576%2028.06-2.318%2037.844-.332%204.374-3.31%204.413-4.036.09z'%20stroke-width='2.3'%20stroke-linejoin='round'%3e%3c/path%3e%3cpath%20id='ref-1--brush__top'%20stroke-linejoin='round'%20stroke-width='2.3'%20d='M77.184%2026.428s-5.621%207.02-5.621%2011.978c0%204.957%202.206%206.878%205.81%206.878%203.606%200%205.148-1.708%205.29-6.736.142-5.028-5.479-12.12-5.479-12.12z'%3e%3c/path%3e%3c/defs%3e%3c/svg%3e" />
</div>
<div class="loading__text">Loading&hellip;</div>
</div>
</body>
</html>
-34
View File
@@ -1,34 +0,0 @@
var webpackConfig = require('./webpack.config.js');
// Karma configuration
module.exports = function(config) {
var browsers = ['Chrome'];
if (process.env.TRAVIS) {
browsers = ['Firefox'];
}
config.set({
browsers: browsers,
frameworks: ['mocha'],
// ... normal karma configuration
files: [
// all files ending in "_test"
{pattern: 'test/*_test.js', watched: false},
{pattern: 'test/**/*_test.js', watched: false}
// each file acts as entry point for the webpack configuration
],
preprocessors: {
// add webpack as preprocessor
'test/*_test.js': ['webpack'],
'test/**/*_test.js': ['webpack']
},
webpack: webpackConfig,
webpackMiddleware: {
// webpack-dev-middleware configuration
// i. e.
stats: 'errors-only'
}
});
};
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 410 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

-118
View File
@@ -1,118 +0,0 @@
{
"name": "maputnik",
"version": "0.0.1",
"description": "A MapboxGL visual style editor",
"main": "''",
"scripts": {
"stats": "webpack --config webpack.production.config.js --profile --json > stats.json",
"build": "webpack --config webpack.production.config.js --progress --profile --colors",
"test": "karma start --single-run",
"test-watch": "karma start",
"start": "webpack-dev-server --progress --profile --colors --watch-poll",
"lint": "eslint --ext js --ext jsx {src,test}"
},
"repository": {
"type": "git",
"url": "https://github.com/maputnik/editor"
},
"author": "Lukas Martinelli",
"license": "MIT",
"homepage": "https://github.com/maputnik/editor#readme",
"dependencies": {
"color": "^1.0.3",
"file-saver": "^1.3.2",
"lodash.clonedeep": "^4.5.0",
"lodash.throttle": "^4.1.1",
"lodash.topairs": "^4.3.0",
"mapbox-gl": "mapbox/mapbox-gl-js#6c24b9621d2aa770eda67fb5638b4d78087b5624",
"mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#e85407a377510acb647161de6be6357ab4f606dd",
"ol-mapbox-style": "0.0.11",
"openlayers": "^3.19.1",
"randomcolor": "^0.4.4",
"react": "^15.4.0",
"react-addons-pure-render-mixin": "^15.4.0",
"react-codemirror": "^0.3.0",
"react-collapse": "^2.3.3",
"react-color": "^2.10.0",
"react-dom": "^15.4.0",
"react-file-reader-input": "^1.1.0",
"react-height": "^2.1.1",
"react-icon-base": "^2.0.4",
"react-icons": "^2.2.1",
"react-motion": "^0.4.7",
"react-sortable-hoc": "^0.4.5",
"request": "^2.79.0"
},
"babel": {
"presets": [
"es2015",
"react"
],
"plugins": [
"transform-object-rest-spread"
]
},
"jshintConfig": {
"esversion": 6
},
"eslintConfig": {
"plugins": [
"react"
],
"extend": [
"plugin:react/recommended"
],
"env": {
"browser": true,
"node": true,
"es6": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true,
"experimentalObjectRestSpread": true,
"jsx": true
}
}
},
"devDependencies": {
"babel-core": "6.14.0",
"babel-eslint": "^6.1.2",
"babel-loader": "6.2.4",
"babel-plugin-transform-class-properties": "^6.11.5",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-flow-strip-types": "^6.21.0",
"babel-plugin-transform-object-rest-spread": "^6.8.0",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015": "6.14.0",
"babel-preset-react": "6.11.1",
"babel-runtime": "^6.11.6",
"css-loader": "0.25.0",
"eslint": "^3.5.0",
"eslint-plugin-react": "^6.2.0",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "0.9.0",
"html-webpack-plugin": "^2.22.0",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-firefox-launcher": "^1.0.0",
"karma-mocha": "^1.3.0",
"karma-webpack": "^1.8.0",
"mocha": "^3.1.2",
"mocha-loader": "^1.0.0",
"node-sass": "^3.9.2",
"react-hot-loader": "^3.0.0-beta.6",
"sass-loader": "^4.0.1",
"style-loader": "0.13.1",
"transform-loader": "^0.2.3",
"url-loader": "0.5.7",
"webpack": "1.13.2",
"webpack-cleanup-plugin": "^0.3.0",
"webpack-dev-server": "1.15.1",
"webworkify-webpack": "^1.1.3"
}
}
-43
View File
@@ -1,43 +0,0 @@
.cm-s-maputnik.CodeMirror {
height: 100%;
font-size: 10px;
}
.cm-s-maputnik.CodeMirror, .cm-s-maputnik .CodeMirror-gutters {
background: transparent;
color: #8e8e8e;
border: none;
}
.cm-s-maputnik .CodeMirror-cursor {
border-left: solid thin #8e8e8e !important;
}
.cm-s-maputnik.CodeMirror-focused div.CodeMirror-selected {
background: rgba(255, 255, 255, 0.10);
}
.cm-s-maputnik .CodeMirror-line::selection,
.cm-s-maputnik .CodeMirror-line > span::selection,
.cm-s-maputnik .CodeMirror-line > span > span::selection {
background: rgba(255, 255, 255, 0.10);
}
.cm-s-maputnik .CodeMirror-line::-moz-selection,
.cm-s-maputnik .CodeMirror-line > span::-moz-selection,
.cm-s-maputnik .CodeMirror-line > span > span::-moz-selection {
background: rgba(255, 255, 255, 0.10);
}
.cm-s-maputnik span.cm-string, .cm-s-maputnik span.cm-string-2 {
color: #8f9d6a;
}
.cm-s-maputnik span.cm-number { color: #91675f; }
.cm-s-maputnik span.cm-property { color: #b8a077; }
.cm-s-maputnik .CodeMirror-activeline-background {
background: rgba(255,255,255,0.1);
}
.cm-s-maputnik .CodeMirror-matchingbracket {
text-decoration: underline; color: white !important;
}
-152
View File
@@ -1,152 +0,0 @@
import React from 'react'
import { saveAs } from 'file-saver'
import MapboxGlMap from './map/MapboxGlMap'
import OpenLayers3Map from './map/OpenLayers3Map'
import LayerList from './layers/LayerList'
import LayerEditor from './layers/LayerEditor'
import Toolbar from './Toolbar'
import AppLayout from './AppLayout'
import style from '../libs/style.js'
import { loadDefaultStyle, SettingsStore, StyleStore } from '../libs/stylestore'
import { ApiStyleStore } from '../libs/apistore'
import LayerWatcher from '../libs/layerwatcher'
export default class App extends React.Component {
constructor(props) {
super(props)
this.layerWatcher = new LayerWatcher()
this.styleStore = new ApiStyleStore()
this.styleStore.supported(isSupported => {
if(!isSupported) {
console.log('Falling back to local storage for storing styles')
this.styleStore = new StyleStore()
}
this.styleStore.latestStyle(mapStyle => this.onStyleChanged(mapStyle))
})
this.settingsStore = new SettingsStore()
this.state = {
accessToken: this.settingsStore.accessToken,
mapStyle: style.emptyStyle,
selectedLayerIndex: 0,
}
}
onReset() {
this.styleStore.purge()
loadDefaultStyle(mapStyle => this.onStyleOpen(mapStyle))
}
onStyleDownload() {
const mapStyle = this.state.mapStyle
const blob = new Blob([JSON.stringify(mapStyle, null, 4)], {type: "application/json;charset=utf-8"});
saveAs(blob, mapStyle.id + ".json");
}
saveStyle(snapshotStyle) {
snapshotStyle.modified = new Date().toJSON()
this.styleStore.save(snapshotStyle)
}
onStyleChanged(newStyle) {
this.saveStyle(newStyle)
this.setState({ mapStyle: newStyle })
}
onAccessTokenChanged(newToken) {
this.settingsStore.accessToken = newToken
this.setState({ accessToken: newToken })
}
onLayersChange(changedLayers) {
const changedStyle = {
...this.state.mapStyle,
layers: changedLayers
}
this.onStyleChanged(changedStyle)
}
onLayerIdChange(oldId, newId) {
const changedLayers = this.state.mapStyle.layers.slice(0)
const idx = style.indexOfLayer(changedLayers, oldId)
changedLayers[idx] = {
...changedLayers[idx],
id: newId
}
this.onLayersChange(changedLayers)
}
onLayerChanged(layer) {
const changedLayers = this.state.mapStyle.layers.slice(0)
const idx = style.indexOfLayer(changedLayers, layer.id)
changedLayers[idx] = layer
this.onLayersChange(changedLayers)
}
mapRenderer() {
const mapProps = {
mapStyle: this.state.mapStyle,
accessToken: this.state.accessToken,
onMapLoaded: (map) => {
this.layerWatcher.map = map
}
}
const metadata = this.state.mapStyle.metadata || {}
const renderer = metadata['maputnik:renderer'] || 'mbgljs'
// Check if OL3 code has been loaded?
if(renderer === 'ol3') {
return <OpenLayers3Map {...mapProps} />
} else {
return <MapboxGlMap {...mapProps} />
}
}
onLayerSelect(layerId) {
const idx = style.indexOfLayer(this.state.mapStyle.layers, layerId)
this.setState({ selectedLayerIndex: idx })
}
render() {
const layers = this.state.mapStyle.layers || []
const selectedLayer = layers.length > 0 ? layers[this.state.selectedLayerIndex] : null
const toolbar = <Toolbar
mapStyle={this.state.mapStyle}
onStyleChanged={this.onStyleChanged.bind(this)}
onStyleOpen={this.onStyleChanged.bind(this)}
onStyleDownload={this.onStyleDownload.bind(this)}
/>
const layerList = <LayerList
onLayersChange={this.onLayersChange.bind(this)}
onLayerSelect={this.onLayerSelect.bind(this)}
selectedLayerIndex={this.state.selectedLayerIndex}
layers={layers}
/>
const layerEditor = selectedLayer ? <LayerEditor
layer={selectedLayer}
sources={this.layerWatcher.sources}
vectorLayers={this.layerWatcher.vectorLayers}
onLayerChanged={this.onLayerChanged.bind(this)}
onLayerIdChange={this.onLayerIdChange.bind(this)}
/> : null
return <AppLayout
toolbar={toolbar}
layerList={layerList}
layerEditor={layerEditor}
map={this.mapRenderer()}
/>
}
}
-66
View File
@@ -1,66 +0,0 @@
import React from 'react'
import ScrollContainer from './ScrollContainer'
import theme from '../config/theme'
import colors from '../config/colors'
class AppLayout extends React.Component {
static propTypes = {
toolbar: React.PropTypes.element.isRequired,
layerList: React.PropTypes.element.isRequired,
layerEditor: React.PropTypes.element,
map: React.PropTypes.element.isRequired,
}
static childContextTypes = {
reactIconBase: React.PropTypes.object
}
getChildContext() {
return {
reactIconBase: { size: 14 }
}
}
render() {
return <div style={{
fontFamily: theme.fontFamily,
color: theme.color,
fontWeight: 300
}}>
{this.props.toolbar}
<div style={{
position: 'fixed',
bottom: 0,
height: "100%",
top: 40,
left: 0,
zIndex: 1,
width: 200,
overflow: "hidden",
backgroundColor: colors.black
}}>
<ScrollContainer>
{this.props.layerList}
</ScrollContainer>
</div>
<div style={{
position: 'fixed',
bottom: 0,
height: "100%",
top: 40,
left: 200,
zIndex: 1,
width: 300,
backgroundColor: colors.black
}}>
<ScrollContainer>
{this.props.layerEditor}
</ScrollContainer>
</div>
{this.props.map}
</div>
}
}
export default AppLayout
-29
View File
@@ -1,29 +0,0 @@
import React from 'react'
import colors from '../config/colors'
import { margins, fontSizes } from '../config/scales'
class Button extends React.Component {
static propTypes = {
onClick: React.PropTypes.func,
style: React.PropTypes.object,
}
render() {
return <a
onClick={this.props.onClick}
style={{
cursor: 'pointer',
backgroundColor: colors.midgray,
color: colors.lowgray,
fontSize: fontSizes[4],
padding: margins[1],
userSelect: 'none',
borderRadius: 2,
...this.props.style,
}}>
{this.props.children}
</a>
}
}
export default Button
-32
View File
@@ -1,32 +0,0 @@
import React from 'react'
import { fontSizes, margins } from '../config/scales'
class Heading extends React.Component {
static propTypes = {
level: React.PropTypes.number.isRequired,
style: React.PropTypes.object,
}
render() {
const headingProps = {
style: {
fontWeight: 400,
fontSize: fontSizes[this.props.level - 1],
marginBottom: margins[1],
...this.props.style
}
}
switch(this.props.level) {
case 1: return <h1 {...headingProps}>{this.props.children}</h1>
case 2: return <h2 {...headingProps}>{this.props.children}</h2>
case 3: return <h3 {...headingProps}>{this.props.children}</h3>
case 4: return <h4 {...headingProps}>{this.props.children}</h4>
case 5: return <h5 {...headingProps}>{this.props.children}</h5>
default: return <h6 {...headingProps}>{this.props.children}</h6>
}
}
}
export default Heading
-13
View File
@@ -1,13 +0,0 @@
import React from 'react'
import colors from '../config/colors'
import { margins, fontSizes } from '../config/scales'
const Paragraph = (props) => <p style={{
color: colors.lowgray,
fontSize: fontSizes[5],
...props.style
}}>
{props.children}
</p>
export default Paragraph
-18
View File
@@ -1,18 +0,0 @@
import React from 'react'
import scrollbars from './scrollbars.scss'
const ScrollContainer = (props) => {
return <div className={scrollbars.darkScrollbar} style={{
overflowX: "visible",
overflowY: "scroll",
bottom:0,
left:0,
right:0,
top:1,
position: "absolute",
}}>
{props.children}
</div>
}
export default ScrollContainer
-173
View File
@@ -1,173 +0,0 @@
import React from 'react'
import FileReaderInput from 'react-file-reader-input'
import MdFileDownload from 'react-icons/lib/md/file-download'
import MdFileUpload from 'react-icons/lib/md/file-upload'
import MdOpenInBrowser from 'react-icons/lib/md/open-in-browser'
import MdSettings from 'react-icons/lib/md/settings'
import MdInfo from 'react-icons/lib/md/info'
import MdLayers from 'react-icons/lib/md/layers'
import MdSave from 'react-icons/lib/md/save'
import MdStyle from 'react-icons/lib/md/style'
import MdMap from 'react-icons/lib/md/map'
import MdInsertEmoticon from 'react-icons/lib/md/insert-emoticon'
import MdFontDownload from 'react-icons/lib/md/font-download'
import MdHelpOutline from 'react-icons/lib/md/help-outline'
import MdFindInPage from 'react-icons/lib/md/find-in-page'
import SettingsModal from './modals/SettingsModal'
import SourcesModal from './modals/SourcesModal'
import OpenModal from './modals/OpenModal'
import style from '../libs/style'
import colors from '../config/colors'
import { margins, fontSizes } from '../config/scales'
const IconText = props => <span style={{ paddingLeft: margins[0] }}>
{props.children}
</span>
const actionStyle = {
display: "inline-block",
padding: 12.5,
fontSize: fontSizes[4],
cursor: "pointer",
color: colors.white,
textDecoration: 'none',
}
const ToolbarLink = props => <a
href={props.href}
target={"blank"}
style={{
...actionStyle,
...props.style,
}}>
{props.children}
</a>
class ToolbarAction extends React.Component {
static propTypes = {
onClick: React.PropTypes.func.isRequired,
}
constructor(props) {
super(props)
this.state = { hover: false }
}
render() {
return <a
onClick={this.props.onClick}
onMouseOver={e => this.setState({hover: true})}
onMouseOut={e => this.setState({hover: false})}
style={{
...actionStyle,
...this.props.style,
backgroundColor: this.state.hover ? colors.gray : null,
}}>
{this.props.children}
</a>
}
}
export default class Toolbar extends React.Component {
static propTypes = {
mapStyle: React.PropTypes.object.isRequired,
onStyleChanged: React.PropTypes.func.isRequired,
// A new style has been uploaded
onStyleOpen: React.PropTypes.func.isRequired,
// Current style is requested for download
onStyleDownload: React.PropTypes.func.isRequired,
}
constructor(props) {
super(props)
this.state = {
isOpen: {
settings: false,
sources: false,
open: false,
}
}
}
downloadButton() {
return <ToolbarAction onClick={this.props.onStyleDownload}>
<MdFileDownload />
<IconText>Download</IconText>
</ToolbarAction>
}
toggleModal(modalName) {
this.setState({
isOpen: {
...this.state.isOpen,
[modalName]: !this.state.isOpen[modalName]
}
})
}
render() {
return <div style={{
position: "fixed",
height: 40,
width: '100%',
zIndex: 100,
left: 0,
top: 0,
backgroundColor: colors.black
}}>
<SettingsModal
mapStyle={this.props.mapStyle}
onStyleChanged={this.props.onStyleChanged}
isOpen={this.state.isOpen.settings}
onOpenToggle={this.toggleModal.bind(this, 'settings')}
/>
<OpenModal
isOpen={this.state.isOpen.open}
onStyleOpen={this.props.onStyleOpen}
onOpenToggle={this.toggleModal.bind(this, 'open')}
/>
<SourcesModal
mapStyle={this.props.mapStyle}
onStyleChanged={this.props.onStyleChanged}
isOpen={this.state.isOpen.sources}
onOpenToggle={this.toggleModal.bind(this, 'sources')}
/>
<ToolbarLink
href={"https://github.com/maputnik/editor"}
style={{
width: 180,
textAlign: 'left',
backgroundColor: colors.black,
padding: 5,
}}
>
<img src="https://github.com/maputnik/editor/raw/master/media/maputnik.png" alt="Maputnik" style={{width: 30, height: 30, paddingRight: 5, verticalAlign: 'middle'}}/>
<span style={{fontSize: 20, verticalAlign: 'middle' }}>Maputnik</span>
</ToolbarLink>
<ToolbarAction onClick={this.toggleModal.bind(this, 'open')}>
<MdOpenInBrowser />
<IconText>Open</IconText>
</ToolbarAction>
{this.downloadButton()}
<ToolbarAction onClick={this.toggleModal.bind(this, 'sources')}>
<MdLayers />
<IconText>Sources</IconText>
</ToolbarAction>
<ToolbarAction onClick={this.toggleModal.bind(this, 'settings')}>
<MdSettings />
<IconText>Style Settings</IconText>
</ToolbarAction>
<ToolbarAction onClick={this.toggleModal.bind(this, 'settings')}>
<MdFindInPage />
<IconText>Inspect</IconText>
</ToolbarAction>
<ToolbarLink href={"https://github.com/maputnik/editor/wiki"}>
<MdHelpOutline />
<IconText>Help</IconText>
</ToolbarLink>
</div>
}
}
-75
View File
@@ -1,75 +0,0 @@
import React from 'react'
import input from '../../config/input'
import colors from '../../config/colors'
import { margins } from '../../config/scales'
class BooleanField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
name: React.PropTypes.string.isRequired,
value: React.PropTypes.bool,
doc: React.PropTypes.string,
style: React.PropTypes.object,
}
render() {
const styles = {
root: {
...input.base,
padding: 0,
position: 'relative',
textAlign: 'center ',
cursor: 'pointer'
},
input: {
position: 'absolute',
zIndex: -1,
opacity: 0
},
box: {
display: 'inline-block',
textAlign: 'center ',
height: 15,
width: 15,
marginRight: margins[1],
marginBottom: null,
backgroundColor: colors.gray,
borderRadius: 2,
borderStyle: 'solid',
borderWidth: 2,
borderColor: colors.gray,
transition: 'background-color .1s ease-out'
},
icon: {
display: this.props.value ? null : 'none',
width: '75%',
height: '75%',
marginTop: 1,
fill: colors.lowgray
}
}
return <label style={styles.root}>
<input
type="checkbox"
style={{
...styles.input,
...this.props.style,
}}
value={this.props.value}
onChange={e => {this.props.onChange(!this.props.value)}}
checked={this.props.value}
/>
<div style={styles.box}>
<svg
viewBox='0 0 32 32'
style={styles.icon}>
<path d='M1 14 L5 10 L13 18 L27 4 L31 8 L13 26 z' />
</svg>
</div>
</label>
}
}
export default BooleanField
-105
View File
@@ -1,105 +0,0 @@
import React from 'react'
import Color from 'color'
import ChromePicker from 'react-color/lib/components/chrome/Chrome'
import input from '../../config/input.js'
function formatColor(color) {
const rgb = color.rgb
return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${rgb.a})`
}
/*** Number fields with support for min, max and units and documentation*/
class ColorField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
name: React.PropTypes.string.isRequired,
value: React.PropTypes.string,
doc: React.PropTypes.string,
style: React.PropTypes.object,
}
constructor(props) {
super(props)
this.state = {
pickerOpened: false,
}
}
//TODO: I much rather would do this with absolute positioning
//but I am too stupid to get it to work together with fixed position
//and scrollbars so I have to fallback to JavaScript
calcPickerOffset() {
const elem = this.refs.colorInput
if(elem) {
const pos = elem.getBoundingClientRect()
return {
top: pos.top,
left: pos.left + 165,
}
} else {
console.warn('Color field has no element to adjust position')
return {
top: 160,
left: 500,
}
}
}
togglePicker() {
this.setState({ pickerOpened: !this.state.pickerOpened })
}
get color() {
return Color(this.props.value || '#fff')
}
render() {
const offset = this.calcPickerOffset()
const picker = <div
style={{
position: 'fixed',
zIndex: 1,
left: offset.left,
top: offset.top,
}}>
<ChromePicker
color={this.color.object()}
onChange={c => this.props.onChange(formatColor(c))}
/>
<div
onClick={this.togglePicker.bind(this)}
style={{
zIndex: -1,
position: 'fixed',
top: '0px',
right: '0px',
bottom: '0px',
left: '0px',
}}
/>
</div>
return <div style={{
...input.property,
position: 'relative',
display: 'inline',
}}>
{this.state.pickerOpened && picker}
<input
ref="colorInput"
onClick={this.togglePicker.bind(this)}
style={{
...input.select,
...this.props.style
}}
name={this.props.name}
placeholder={this.props.default}
value={this.props.value ? this.props.value : ""}
onChange={(e) => this.props.onChange(e.target.value)}
/>
</div>
}
}
export default ColorField
-36
View File
@@ -1,36 +0,0 @@
import React from 'react'
import input from '../../config/input.js'
class EnumField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
name: React.PropTypes.string.isRequired,
value: React.PropTypes.string,
allowedValues: React.PropTypes.array.isRequired,
doc: React.PropTypes.string,
style: React.PropTypes.object,
}
onChange(e) {
return this.props.onChange(e.target.value)
}
render() {
const options = this.props.allowedValues.map(val => {
return <option key={val} value={val}>{val}</option>
})
return <select
style={{
...input.select,
...this.props.style
}}
value={this.props.value}
onChange={this.onChange.bind(this)}
>
{options}
</select>
}
}
export default EnumField
-50
View File
@@ -1,50 +0,0 @@
import React from 'react'
import input from '../../config/input.js'
/*** Number fields with support for min, max and units and documentation*/
class NumberField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
name: React.PropTypes.string.isRequired,
value: React.PropTypes.number,
default: React.PropTypes.number,
unit: React.PropTypes.string,
min: React.PropTypes.number,
max: React.PropTypes.number,
doc: React.PropTypes.string,
style: React.PropTypes.object,
}
onChange(e) {
const value = parseFloat(e.target.value)
/*TODO: we can do range validation already here?
if(this.props.min && value < this.props.min) return
if(this.props.max && value > this.props.max) return
*/
this.props.onChange(value)
}
render() {
let stepSize = null
if(this.props.max && this.props.min) {
stepSize = (this.props.max - this.props.min) / 10
}
return <input
style={{
...input.input,
...this.props.style
}}
type="number"
min={this.props.min}
max={this.props.max}
step={stepSize}
name={this.props.name}
placeholder={this.props.default}
value={this.props.value}
onChange={this.onChange.bind(this)}
/>
}
}
export default NumberField
-62
View File
@@ -1,62 +0,0 @@
import React from 'react'
import GlSpec from 'mapbox-gl-style-spec/reference/latest.min.js'
import ZoomSpecField from './ZoomSpecField'
import colors from '../../config/colors'
import { margins } from '../../config/scales'
/** Extract field spec by {@fieldName} from the {@layerType} in the
* style specification from either the paint or layout group */
function getFieldSpec(layerType, fieldName) {
const groupName = getGroupName(layerType, fieldName)
const group = GlSpec[groupName + '_' + layerType]
return group[fieldName]
}
function getGroupName(layerType, fieldName) {
const paint = GlSpec['paint_' + layerType] || {}
if (fieldName in paint) {
return 'paint'
} else {
return 'layout'
}
}
export default class PropertyGroup extends React.Component {
static propTypes = {
layer: React.PropTypes.object.isRequired,
groupFields: React.PropTypes.array.isRequired,
onChange: React.PropTypes.func.isRequired,
}
onPropertyChange(property, newValue) {
const group = getGroupName(this.props.layer.type, property)
this.props.onChange(group , property ,newValue)
}
render() {
const fields = this.props.groupFields.map(fieldName => {
const fieldSpec = getFieldSpec(this.props.layer.type, fieldName)
const paint = this.props.layer.paint || {}
const layout = this.props.layer.layout || {}
const fieldValue = paint[fieldName] || layout[fieldName]
return <ZoomSpecField
onChange={this.onPropertyChange.bind(this)}
key={fieldName}
fieldName={fieldName}
value={fieldValue}
fieldSpec={fieldSpec}
/>
})
return <div style={{
padding: margins[2],
paddingRight: 0,
backgroundColor: colors.black,
}}>
{fields}
</div>
}
}
-80
View File
@@ -1,80 +0,0 @@
import React from 'react'
import color from 'color'
import GlSpec from 'mapbox-gl-style-spec/reference/latest.min.js'
import NumberField from './NumberField'
import EnumField from './EnumField'
import BooleanField from './BooleanField'
import ColorField from './ColorField'
import StringField from './StringField'
import input from '../../config/input.js'
function labelFromFieldName(fieldName) {
let label = fieldName.split('-').slice(1).join(' ')
if(label.length > 0) {
label = label.charAt(0).toUpperCase() + label.slice(1);
}
return label
}
/** Display any field from the Mapbox GL style spec and
* choose the correct field component based on the @{fieldSpec}
* to display @{value}. */
export default class SpecField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
fieldName: React.PropTypes.string.isRequired,
fieldSpec: React.PropTypes.object.isRequired,
value: React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.number,
]),
/** Override the style of the field */
style: React.PropTypes.object,
}
render() {
const commonProps = {
doc: this.props.fieldSpec.doc,
style: this.props.style,
value: this.props.value,
name: this.props.fieldName,
onChange: newValue => this.props.onChange(this.props.fieldName, newValue)
}
switch(this.props.fieldSpec.type) {
case 'number': return (
<NumberField
{...commonProps}
default={this.props.fieldSpec.default}
min={this.props.fieldSpec.minimum}
max={this.props.fieldSpec.maximum}
unit={this.props.fieldSpec.unit}
/>
)
case 'enum': return (
<EnumField
{...commonProps}
allowedValues={Object.keys(this.props.fieldSpec.values)}
/>
)
case 'string': return (
<StringField
{...commonProps}
/>
)
case 'color': return (
<ColorField
{...commonProps}
/>
)
case 'boolean': return (
<BooleanField
{...commonProps}
/>
)
default: return null
}
}
}
-34
View File
@@ -1,34 +0,0 @@
import React from 'react'
import input from '../../config/input.js'
/*** Number fields with support for min, max and units and documentation*/
class StringField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
name: React.PropTypes.string.isRequired,
value: React.PropTypes.string,
default: React.PropTypes.number,
doc: React.PropTypes.string,
style: React.PropTypes.object,
}
onChange(e) {
const value = e.target.value
return this.props.onChange(value === "" ? null: value)
}
render() {
return <input
style={{
...input.input,
...this.props.style
}}
name={this.props.name}
placeholder={this.props.default}
value={this.props.value ? this.props.value : ""}
onChange={this.onChange.bind(this)}
/>
}
}
export default StringField
-97
View File
@@ -1,97 +0,0 @@
import React from 'react'
import Color from 'color'
import NumberField from './NumberField'
import EnumField from './EnumField'
import BooleanField from './BooleanField'
import ColorField from './ColorField'
import StringField from './StringField'
import SpecField from './SpecField'
import input from '../../config/input.js'
import colors from '../../config/colors.js'
import { margins } from '../../config/scales.js'
function isZoomField(value) {
return typeof value === 'object' && value.stops
}
const specFieldProps = {
onChange: React.PropTypes.func.isRequired,
fieldName: React.PropTypes.string.isRequired,
fieldSpec: React.PropTypes.object.isRequired,
}
/** Supports displaying spec field for zoom function objects
* https://www.mapbox.com/mapbox-gl-style-spec/#types-function-zoom-property
*/
export default class ZoomSpecField extends React.Component {
static propTypes = {
onChange: React.PropTypes.func.isRequired,
fieldName: React.PropTypes.string.isRequired,
fieldSpec: React.PropTypes.object.isRequired,
value: React.PropTypes.oneOfType([
React.PropTypes.object,
React.PropTypes.string,
React.PropTypes.number,
React.PropTypes.bool,
]),
}
render() {
const label = <label style={input.label}>
{labelFromFieldName(this.props.fieldName)}
</label>
if(isZoomField(this.props.value)) {
const zoomFields = this.props.value.stops.map(stop => {
const zoomLevel = stop[0]
const value = stop[1]
return <div style={input.property} key={zoomLevel}>
{label}
<SpecField {...this.props}
value={value}
style={{
width: '33%'
}}
/>
<input
style={{
...input.input,
width: '10%',
marginLeft: margins[0],
}}
type="number"
value={zoomLevel}
min={0}
max={22}
/>
</div>
})
return <div style={{
border: 1,
borderStyle: 'solid',
borderColor: Color(colors.gray).lighten(0.1).string(),
padding: margins[1],
}}>
{zoomFields}
</div>
} else {
return <div style={input.property}>
{label}
<SpecField {...this.props} />
</div>
}
}
}
function labelFromFieldName(fieldName) {
let label = fieldName.split('-').slice(1).join(' ')
if(label.length > 0) {
label = label.charAt(0).toUpperCase() + label.slice(1);
}
return label
}
-180
View File
@@ -1,180 +0,0 @@
import React from 'react'
import GlSpec from 'mapbox-gl-style-spec/reference/latest.min.js'
import input from '../../config/input.js'
import colors from '../../config/colors.js'
import { margins } from '../../config/scales.js'
const combiningFilterOps = ['all', 'any', 'none']
const setFilterOps = ['in', '!in']
const otherFilterOps = Object
.keys(GlSpec.filter_operator.values)
.filter(op => combiningFilterOps.indexOf(op) < 0)
class CombiningOperatorSelect extends React.Component {
static propTypes = {
value: React.PropTypes.string.isRequired,
onChange: React.PropTypes.func.isRequired,
}
render() {
const options = combiningFilterOps.map(op => {
return <option key={op} value={op}>{op}</option>
})
return <div>
<select
style={{
...input.select,
width: '20.5%',
margin: margins[0],
}}
value={this.props.value}
onChange={e => this.props.onChange(e.target.value)}
>
{options}
</select>
<label style={{
...input.label,
width: '60%',
marginLeft: margins[0],
}}>
of the filters matches
</label>
</div>
}
}
class OperatorSelect extends React.Component {
static propTypes = {
value: React.PropTypes.string.isRequired,
onChange: React.PropTypes.func.isRequired,
}
render() {
const options = otherFilterOps.map(op => {
return <option key={op} value={op}>{op}</option>
})
return <select
style={{
...input.select,
width: '15%',
margin: margins[0]
}}
value={this.props.value}
onChange={e => this.props.onChange(e.target.value)}
>
{options}
</select>
}
}
class SingleFilterEditor extends React.Component {
static propTypes = {
filter: React.PropTypes.array.isRequired,
onChange: React.PropTypes.func.isRequired,
properties: React.PropTypes.object,
}
static defaultProps = {
properties: {},
}
onFilterPartChanged(filterOp, propertyName, filterArgs) {
const newFilter = [filterOp, propertyName, ...filterArgs]
this.props.onChange(newFilter)
}
render() {
const f = this.props.filter
const filterOp = f[0]
const propertyName = f[1]
const filterArgs = f.slice(2)
return <div>
<select
style={{
...input.select,
width: '17%',
margin: margins[0]
}}
value={propertyName}
onChange={newPropertyName => this.onFilterPartChanged(filterOp, newPropertyName, filterArgs)}
>
{Object.keys(this.props.properties).map(propName => {
return <option key={propName} value={propName}>{propName}</option>
})}
</select>
<OperatorSelect
value={filterOp}
onChange={newFilterOp => this.onFilterPartChanged(newFilterOp, propertyName, filterArgs)}
/>
<input
style={{
...input.input,
width: '53%',
margin: margins[0]
}}
value={filterArgs.join(',')}
onChange={e => {
this.onFilterPartChanged(filterOp, propertyName, e.target.value.split(','))}}
/>
</div>
}
}
export default class CombiningFilterEditor extends React.Component {
static propTypes = {
/** Properties of the vector layer and the available fields */
properties: React.PropTypes.object.isRequired,
filter: React.PropTypes.array.isRequired,
onChange: React.PropTypes.func.isRequired,
}
// Convert filter to combining filter
combiningFilter() {
let combiningOp = this.props.filter[0]
let filters = this.props.filter.slice(1)
if(combiningFilterOps.indexOf(combiningOp) < 0) {
combiningOp = 'all'
filters = [this.props.filter.slice(0)]
}
return [combiningOp, ...filters]
}
onFilterPartChanged(filterIdx, newPart) {
const newFilter = this.combiningFilter().slice(0)
newFilter[filterIdx] = newPart
this.props.onChange(newFilter)
}
render() {
const filter = this.combiningFilter()
let combiningOp = filter[0]
let filters = filter.slice(1)
const filterEditors = filters.map((f, idx) => {
return <SingleFilterEditor
key={idx}
properties={this.props.properties}
filter={f}
onChange={this.onFilterPartChanged.bind(this, idx + 1)}
/>
})
return <div style={{
padding: margins[2],
paddingRight: 0,
backgroundColor: colors.black
}}>
<CombiningOperatorSelect
value={combiningOp}
onChange={this.onFilterPartChanged.bind(this, 0)}
/>
{filterEditors}
</div>
}
}
-15
View File
@@ -1,15 +0,0 @@
import React from 'react'
import IconBase from 'react-icon-base'
export default class BackgroundIcon extends React.Component {
render() {
return (
<IconBase viewBox="0 0 20 20" {...this.props}>
<path d="m 1.821019,10.255581 7.414535,5.020197 c 0.372277,0.25206 0.958697,0.239771 1.30985,-0.02745 L 17.539255,9.926162 C 17.89041,9.658941 17.873288,9.238006 17.501015,8.985946 L 10.08648,3.9657402 C 9.714204,3.7136802 9.127782,3.7259703 8.776627,3.9931918 L 1.782775,9.315365 c -0.3511551,0.267221 -0.3340331,0.688156 0.03824,0.940216 z" />
</IconBase>
)
}
}
-15
View File
@@ -1,15 +0,0 @@
import React from 'react'
import IconBase from 'react-icon-base'
export default class FillIcon extends React.Component {
render() {
return (
<IconBase viewBox="0 0 20 20" {...this.props}>
<path d="M 2.84978,9.763512 9.462149,4.7316391 16.47225,9.478015 9.859886,14.509879 2.84978,9.763512 m -1.028761,0.492069 7.414535,5.020197 c 0.372277,0.25206 0.958697,0.239771 1.30985,-0.02745 L 17.539255,9.926162 C 17.89041,9.658941 17.873288,9.238006 17.501015,8.985946 L 10.08648,3.9657402 C 9.714204,3.7136802 9.127782,3.7259703 8.776627,3.9931918 L 1.782775,9.315365 c -0.3511551,0.267221 -0.3340331,0.688156 0.03824,0.940216 l 0,0 z" />
</IconBase>
)
}
}
-26
View File
@@ -1,26 +0,0 @@
import React from 'react'
import LineIcon from './LineIcon.jsx'
import FillIcon from './FillIcon.jsx'
import SymbolIcon from './SymbolIcon.jsx'
import BackgroundIcon from './BackgroundIcon.jsx'
class LayerIcon extends React.Component {
static propTypes = {
type: React.PropTypes.string.isRequired,
style: React.PropTypes.object,
}
render() {
const iconProps = { style: this.props.style }
switch(this.props.type) {
case 'fill': return <FillIcon {...iconProps} />
case 'background': return <BackgroundIcon {...iconProps} />
case 'line': return <LineIcon {...iconProps} />
case 'symbol': return <SymbolIcon {...iconProps} />
default: return null
}
}
}
export default LayerIcon
-15
View File
@@ -1,15 +0,0 @@
import React from 'react'
import IconBase from 'react-icon-base'
export default class FillIcon extends React.Component {
render() {
return (
<IconBase viewBox="0 0 20 20" {...this.props}>
<path id="path8" d="M 12.34,1.29 C 12.5114,1.1076 12.7497,1.0029 13,1 13.5523,1 14,1.4477 14,2 14.0047,2.2478 13.907,2.4866 13.73,2.66 9.785626,6.5516986 6.6148407,9.7551593 2.65,13.72 2.4793,13.8963 2.2453,13.9971 2,14 1.4477,14 1,13.5523 1,13 0.9953,12.7522 1.093,12.5134 1.27,12.34 4.9761967,8.7018093 9.0356422,4.5930579 12.34,1.29 Z" transform="translate(2,2)" />
</IconBase>
)
}
}
-18
View File
@@ -1,18 +0,0 @@
import React from 'react'
import IconBase from 'react-icon-base'
export default class SymbolIcon extends React.Component {
render() {
return (
<IconBase viewBox="0 0 20 20" {...this.props}>
<g id="svg_1" transform="matrix(1.2718518,0,0,1.2601269,16.559526,-7.4065264)">
<path id="svg_2" d="m -9.7959773,11.060163 c -0.3734787,-0.724437 -0.3580577,-1.2147051 -0.00547,-1.8767873 l 8.6034029,-0.019416 c 0.39670292,0.6865644 0.38365934,1.4750693 -0.011097,1.8864953 l -3.1359613,-0.0033 -0.013695,7.1305 c -0.4055357,0.397083 -1.3146432,0.397083 -1.7769191,-0.02274 l 0.030226,-7.104422 z" />
</g>
</IconBase>
)
}
}
-29
View File
@@ -1,29 +0,0 @@
import React from 'react'
import input from '../../config/input'
import { margins } from '../../config/scales'
/** Wrap a component with a label */
class InputBlock extends React.Component {
static propTypes = {
label: React.PropTypes.string.isRequired,
children: React.PropTypes.element.isRequired,
}
onChange(e) {
const value = e.target.value
return this.props.onChange(value === "" ? null: value)
}
render() {
return <div style={{
display: 'block',
marginTop: margins[2],
marginBottom: margins[2],
}}>
<label style={input.label}>{this.props.label}</label>
{this.props.children}
</div>
}
}
export default InputBlock
-31
View File
@@ -1,31 +0,0 @@
import React from 'react'
import input from '../../config/input.js'
class SelectInput extends React.Component {
static propTypes = {
value: React.PropTypes.string.isRequired,
options: React.PropTypes.array.isRequired,
style: React.PropTypes.object,
onChange: React.PropTypes.func.isRequired,
}
render() {
const options = this.props.options.map(([val, label])=> {
return <option key={val} value={val}>{label}</option>
})
return <select
style={{
...input.select,
...this.props.style
}}
value={this.props.value}
onChange={e => this.props.onChange(e.target.value)}
>
{options}
</select>
}
}
export default SelectInput
-23
View File
@@ -1,23 +0,0 @@
import React from 'react'
import input from '../../config/input.js'
class StringInput extends React.Component {
static propTypes = {
value: React.PropTypes.string,
style: React.PropTypes.object,
onChange: React.PropTypes.func,
}
render() {
return <input
style={{
...input.input,
...this.props.style
}}
value={this.props.value}
onChange={e => this.props.onChange(e.target.value)}
/>
}
}
export default StringInput
-64
View File
@@ -1,64 +0,0 @@
import React from 'react'
import CodeMirror from 'react-codemirror'
import InputBlock from '../inputs/InputBlock'
import StringInput from '../inputs/StringInput'
import SelectInput from '../inputs/SelectInput'
import colors from '../../config/colors'
import { margins } from '../../config/scales'
import 'codemirror/mode/javascript/javascript'
import 'codemirror/lib/codemirror.css'
import '../../codemirror-maputnik.css'
class JSONEditor extends React.Component {
static propTypes = {
layer: React.PropTypes.object.isRequired,
onChange: React.PropTypes.func,
}
constructor(props) {
super(props)
this.state = {
code: JSON.stringify(props.layer, null, 2)
}
}
componentWillReceiveProps(nextProps) {
this.setState({
code: JSON.stringify(nextProps.layer, null, 2)
})
}
onCodeUpdate(newCode) {
try {
const parsedLayer = JSON.parse(newCode)
this.props.onChange(parsedLayer)
} catch(err) {
console.warn(err)
this.setState({
code: newCode
})
}
}
render() {
const codeMirrorOptions = {
mode: {name: "javascript", json: true},
tabSize: 2,
theme: 'maputnik',
viewportMargin: Infinity,
lineNumbers: false,
}
return <CodeMirror
value={this.state.code}
onChange={this.onCodeUpdate.bind(this)}
options={codeMirrorOptions}
/>
}
}
export default JSONEditor
-167
View File
@@ -1,167 +0,0 @@
import React from 'react'
import JSONEditor from './JSONEditor'
import SourceEditor from './SourceEditor'
import FilterEditor from '../filter/FilterEditor'
import PropertyGroup from '../fields/PropertyGroup'
import LayerEditorGroup from './LayerEditorGroup'
import LayerSettings from './LayerSettings'
import layout from '../../config/layout.json'
import { margins, fontSizes } from '../../config/scales'
import colors from '../../config/colors'
class UnsupportedLayer extends React.Component {
render() {
return <div></div>
}
}
/** Layer editor supporting multiple types of layers. */
export default class LayerEditor extends React.Component {
static propTypes = {
layer: React.PropTypes.object.isRequired,
sources: React.PropTypes.object,
vectorLayers: React.PropTypes.object,
onLayerChanged: React.PropTypes.func,
onLayerIdChange: React.PropTypes.func,
}
static defaultProps = {
onLayerChanged: () => {},
onLayerIdChange: () => {},
onLayerDestroyed: () => {},
}
static childContextTypes = {
reactIconBase: React.PropTypes.object
}
constructor(props) {
super(props)
//TODO: Clean this up and refactor into function
const editorGroups = {}
layout[this.props.layer.type].groups.forEach(group => {
editorGroups[group.title] = true
})
this.state = { editorGroups }
}
componentWillReceiveProps(nextProps) {
const additionalGroups = { ...this.state.editorGroups }
layout[nextProps.layer.type].groups.forEach(group => {
if(!(group.title in additionalGroups)) {
additionalGroups[group.title] = true
}
})
this.setState({
editorGroups: additionalGroups
})
}
getChildContext () {
return {
reactIconBase: {
size: fontSizes[4],
color: colors.lowgray,
}
}
}
/** A {@property} in either the paint our layout {@group} has changed
* to a {@newValue}.
*/
onPropertyChange(group, property, newValue) {
if(group) {
this.props.onLayerChanged({
...this.props.layer,
[group]: {
...this.props.layer[group],
[property]: newValue
}
})
} else {
this.props.onLayerChanged({
...this.props.layer,
[property]: newValue
})
}
}
onFilterChange(newValue) {
const changedLayer = {
...this.props.layer,
filter: newValue
}
this.props.onLayerChanged(changedLayer)
}
onGroupToggle(groupTitle, active) {
const changedActiveGroups = {
...this.state.editorGroups,
[groupTitle]: active,
}
this.setState({
editorGroups: changedActiveGroups
})
}
renderGroupType(type, fields) {
switch(type) {
case 'settings': return <LayerSettings
id={this.props.layer.id}
type={this.props.layer.type}
onTypeChange={v => this.onPropertyChange(null, 'type', v)}
onIdChange={newId => this.props.onLayerIdChange(this.props.layer.id, newId)}
/>
case 'source': return <div>
<FilterEditor
filter={this.props.layer.filter}
properties={this.props.vectorLayers[this.props.layer['source-layer']]}
onChange={f => this.onFilterChange(f)}
/>
<SourceEditor
source={this.props.layer.source}
sourceLayer={this.props.layer['source-layer']}
sources={this.props.sources}
onSourceChange={console.log}
onSourceLayerChange={console.log}
/>
</div>
case 'properties': return <PropertyGroup
layer={this.props.layer}
groupFields={fields}
onChange={this.onPropertyChange.bind(this)}
/>
case 'jsoneditor': return <JSONEditor
layer={this.props.layer}
onChange={this.props.onLayerChanged}
/>
default: return null
}
}
render() {
const layerType = this.props.layer.type
const layoutGroups = layout[layerType].groups.filter(group => {
return !(this.props.layer.type === 'background' && group.type === 'source')
}).map(group => {
return <LayerEditorGroup
key={group.title}
title={group.title}
isActive={this.state.editorGroups[group.title]}
onActiveToggle={this.onGroupToggle.bind(this, group.title)}
>
{this.renderGroupType(group.type, group.fields)}
</LayerEditorGroup>
})
return <div>
{layoutGroups}
</div>
}
}
@@ -1,63 +0,0 @@
import React from 'react'
import Color from 'color'
import colors from '../../config/colors'
import { margins, fontSizes } from '../../config/scales'
import Collapse from 'react-collapse'
import CollapseOpenIcon from 'react-icons/lib/md/arrow-drop-down'
import CollapseCloseIcon from 'react-icons/lib/md/arrow-drop-up'
class Collapser extends React.Component {
static propTypes = {
isCollapsed: React.PropTypes.bool.isRequired,
}
render() {
const iconStyle = {
width: 20,
height: 20,
}
return this.props.isCollapsed ? <CollapseCloseIcon style={iconStyle}/> : <CollapseOpenIcon style={iconStyle} />
}
}
export default class LayerEditorGroup extends React.Component {
static propTypes = {
title: React.PropTypes.string.isRequired,
isActive: React.PropTypes.bool.isRequired,
children: React.PropTypes.element.isRequired,
onActiveToggle: React.PropTypes.func.isRequired
}
constructor(props) {
super(props)
this.state = { hover: false }
}
render() {
return <div>
<div style={{
fontSize: fontSizes[4],
backgroundColor: this.state.hover ? Color(colors.black).lighten(0.30).string() : Color(colors.black).lighten(0.15).string(),
color: colors.lowgray,
cursor: 'pointer',
userSelect: 'none',
padding: margins[1],
display: 'flex',
flexDirection: 'row',
lineHeight: '20px',
}}
onMouseOver={e => this.setState({hover: true})}
onMouseOut={e => this.setState({hover: false})}
onClick={e => this.props.onActiveToggle(!this.props.isActive)}
>
<span>{this.props.title}</span>
<span style={{flexGrow: 1}} />
<Collapser isCollapsed={this.props.isActive} />
</div>
<Collapse isOpened={this.props.isActive}>
{this.props.children}
</Collapse>
</div>
}
}
-99
View File
@@ -1,99 +0,0 @@
import React from 'react'
import cloneDeep from 'lodash.clonedeep'
import LayerListItem from './LayerListItem'
import style from '../../libs/style.js'
import { margins } from '../../config/scales.js'
import {SortableContainer, SortableHandle, arrayMove} from 'react-sortable-hoc';
const layerListPropTypes = {
layers: React.PropTypes.array.isRequired,
selectedLayerIndex: React.PropTypes.number.isRequired,
onLayersChange: React.PropTypes.func.isRequired,
onLayerSelect: React.PropTypes.func,
}
// List of collapsible layer editors
@SortableContainer
class LayerListContainer extends React.Component {
static propTypes = {...layerListPropTypes}
static defaultProps = {
onLayerSelect: () => {},
}
onLayerDestroy(layerId) {
const remainingLayers = this.props.layers.slice(0)
const idx = style.indexOfLayer(remainingLayers, layerId)
remainingLayers.splice(idx, 1);
this.props.onLayersChange(remainingLayers)
}
onLayerCopy(layerId) {
const changedLayers = this.props.layers.slice(0)
const idx = style.indexOfLayer(changedLayers, layerId)
const clonedLayer = cloneDeep(changedLayers[idx])
clonedLayer.id = clonedLayer.id + "-copy"
changedLayers.splice(idx, 0, clonedLayer)
this.props.onLayersChange(changedLayers)
}
onLayerVisibilityToggle(layerId) {
const changedLayers = this.props.layers.slice(0)
const idx = style.indexOfLayer(changedLayers, layerId)
const layer = { ...changedLayers[idx] }
const changedLayout = 'layout' in layer ? {...layer.layout} : {}
changedLayout.visibility = changedLayout.visibility === 'none' ? 'visible' : 'none'
layer.layout = changedLayout
changedLayers[idx] = layer
this.props.onLayersChange(changedLayers)
}
render() {
const layerPanels = this.props.layers.map((layer, index) => {
const layerId = layer.id
return <LayerListItem
index={index}
key={layerId}
layerId={layerId}
layerType={layer.type}
visibility={(layer.layout || {}).visibility}
isSelected={index === this.props.selectedLayerIndex}
onLayerSelect={this.props.onLayerSelect}
onLayerDestroy={this.onLayerDestroy.bind(this)}
onLayerCopy={this.onLayerCopy.bind(this)}
onLayerVisibilityToggle={this.onLayerVisibilityToggle.bind(this)}
/>
})
return <ul style={{
padding: 0,
margin: 0
}}>
{layerPanels}
</ul>
}
}
export default class LayerList extends React.Component {
static propTypes = {...layerListPropTypes}
onSortEnd(move) {
const { oldIndex, newIndex } = move
if(oldIndex === newIndex) return
let layers = this.props.layers.slice(0)
layers = arrayMove(layers, oldIndex, newIndex)
this.props.onLayersChange(layers)
}
render() {
return <LayerListContainer
{...this.props}
onSortEnd={this.onSortEnd.bind(this)}
useDragHandle={true}
/>
}
}
-190
View File
@@ -1,190 +0,0 @@
import React from 'react'
import Color from 'color'
import CopyIcon from 'react-icons/lib/md/content-copy'
import VisibilityIcon from 'react-icons/lib/md/visibility'
import VisibilityOffIcon from 'react-icons/lib/md/visibility-off'
import DeleteIcon from 'react-icons/lib/md/delete'
import LayerIcon from '../icons/LayerIcon'
import LayerEditor from './LayerEditor'
import {SortableElement, SortableHandle} from 'react-sortable-hoc'
import colors from '../../config/colors.js'
import { fontSizes, margins } from '../../config/scales.js'
@SortableHandle
class LayerTypeDragHandle extends React.Component {
static propTypes = LayerIcon.propTypes
render() {
return <LayerIcon
{...this.props}
style={{
cursor: 'move',
width: 15,
height: 15,
paddingRight: margins[0],
}}
/>
}
}
class IconAction extends React.Component {
static propTypes = {
action: React.PropTypes.string.isRequired,
active: React.PropTypes.bool,
onClick: React.PropTypes.func.isRequired,
}
constructor(props) {
super(props)
this.state = { hover: false }
}
renderIcon() {
const iconStyle = {
fill: colors.black
}
if(this.props.active) {
iconStyle.fill = colors.midgray
}
if(this.state.hover) {
iconStyle.fill = colors.lowgray
}
switch(this.props.action) {
case 'copy': return <CopyIcon style={iconStyle} />
case 'show': return <VisibilityIcon style={iconStyle} />
case 'hide': return <VisibilityOffIcon style={iconStyle} />
case 'delete': return <DeleteIcon style={iconStyle} />
default: return null
}
}
render() {
return <a
style={{
display: "inline",
marginLeft: margins[0],
...this.props.style
}}
onClick={this.props.onClick}
onMouseOver={e => this.setState({hover: true})}
onMouseOut={e => this.setState({hover: false})}
>
{this.renderIcon()}
</a>
}
}
@SortableElement
class LayerListItem extends React.Component {
static propTypes = {
layerId: React.PropTypes.string.isRequired,
layerType: React.PropTypes.string.isRequired,
isSelected: React.PropTypes.bool,
visibility: React.PropTypes.string,
onLayerSelect: React.PropTypes.func.isRequired,
onLayerCopy: React.PropTypes.func,
onLayerDestroy: React.PropTypes.func,
onLayerVisibilityToggle: React.PropTypes.func,
}
static defaultProps = {
isSelected: false,
visibility: 'visible',
onLayerCopy: () => {},
onLayerDestroy: () => {},
onLayerVisibilityToggle: () => {},
}
static childContextTypes = {
reactIconBase: React.PropTypes.object
}
constructor(props) {
super(props)
this.state = {
hover: false
}
}
getChildContext() {
return {
reactIconBase: { size: 12 }
}
}
render() {
const itemStyle = {
fontWeight: 400,
color: colors.lowgray,
fontSize: fontSizes[5],
borderLeft: 0,
borderTop: 0,
borderBottom: 1,
borderRight: 0,
borderStyle: "solid",
userSelect: 'none',
listStyle: 'none',
zIndex: 2000,
cursor: 'pointer',
position: 'relative',
padding: margins[1],
borderColor: Color(colors.black).lighten(0.10).string(),
backgroundColor: colors.black,
}
if(this.state.hover) {
itemStyle.backgroundColor = Color(colors.black).lighten(0.10).string()
}
if(this.props.isSelected) {
itemStyle.backgroundColor = Color(colors.black).lighten(0.15).string()
}
const iconProps = {
active: this.state.hover || this.props.isSelected
}
return <li
key={this.props.layerId}
onClick={e => this.props.onLayerSelect(this.props.layerId)}
onMouseOver={e => this.setState({hover: true})}
onMouseOut={e => this.setState({hover: false})}
style={itemStyle}>
<div style={{
display: 'flex',
flexDirection: 'row'
}}>
<LayerTypeDragHandle type={this.props.layerType} />
<span style={{
width: 115,
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis'
}}>{this.props.layerId}</span>
<span style={{flexGrow: 1}} />
<IconAction {...iconProps}
action={'delete'}
onClick={e => this.props.onLayerDestroy(this.props.layerId)}
/>
<IconAction {...iconProps}
action={'copy'}
onClick={e => this.props.onLayerCopy(this.props.layerId)}
/>
<IconAction {...iconProps}
active={this.state.hover || this.props.isSelected || this.props.visibility === 'none'}
action={this.props.visibility === 'visible' ? 'hide' : 'show'}
onClick={e => this.props.onLayerVisibilityToggle(this.props.layerId)}
/>
</div>
</li>
}
}
export default LayerListItem;
-50
View File
@@ -1,50 +0,0 @@
import React from 'react'
import GlSpec from 'mapbox-gl-style-spec/reference/latest.min.js'
import InputBlock from '../inputs/InputBlock'
import StringInput from '../inputs/StringInput'
import SelectInput from '../inputs/SelectInput'
import colors from '../../config/colors'
import { margins } from '../../config/scales'
class LayerSettings extends React.Component {
static propTypes = {
id: React.PropTypes.string.isRequired,
type: React.PropTypes.oneOf(Object.keys(GlSpec.layer.type.values)).isRequired,
onIdChange: React.PropTypes.func.isRequired,
onTypeChange: React.PropTypes.func.isRequired,
}
render() {
return <div style={{
padding: margins[2],
paddingRight: 0,
backgroundColor: colors.black,
}}>
<InputBlock label={"Layer ID"}>
<StringInput
value={this.props.id}
onChange={this.props.onIdChange}
/>
</InputBlock>
<InputBlock label={"Layer Type"}>
<SelectInput
options={[
['background', 'Background'],
['fill', 'Fill'],
['line', 'Line'],
['symbol', 'Symbol'],
['raster', 'Raster'],
['circle', 'Circle'],
['fill-extrusion', 'Fill Extrusion'],
]}
onChange={this.props.onTypeChange}
value={this.props.type}
/>
</InputBlock>
</div>
}
}
export default LayerSettings
-54
View File
@@ -1,54 +0,0 @@
import React from 'react'
import PropertyGroup from '../fields/PropertyGroup'
import input from '../../config/input.js'
/** Choose tileset (source) and the source layer */
export default class SourceEditor extends React.Component {
static propTypes = {
source: React.PropTypes.string.isRequired,
sourceLayer: React.PropTypes.string.isRequired,
onSourceChange: React.PropTypes.func.isRequired,
onSourceLayerChange: React.PropTypes.func.isRequired,
/** List of available sources in the style
* https://www.mapbox.com/mapbox-gl-style-spec/#root-sources */
sources: React.PropTypes.object.isRequired,
}
render() {
const options = Object.keys(this.props.sources).map(sourceId => {
return <option key={sourceId} value={sourceId}>{sourceId}</option>
})
const layerOptions = this.props.sources[this.props.source].map(vectorLayerId => {
const id = vectorLayerId
return <option key={id} value={id}>{id}</option>
})
return <div>
<div style={input.property}>
<label style={input.label}>Source</label>
<select
style={input.select}
value={this.props.source}
onChange={(e) => this.onSourceChange(e.target.value)}
>
{options}
</select>
</div>
<div style={input.property}>
<label style={input.label}>Source Layer</label>
<select
style={input.select}
value={this.props.sourceLayer}
onChange={(e) => this.onSourceLayerChange(e.target.value)}
>
{layerOptions}
</select>
</div>
</div>
}
}
-20
View File
@@ -1,20 +0,0 @@
import React from 'react'
export default class Map extends React.Component {
static propTypes = {
mapStyle: React.PropTypes.object.isRequired,
accessToken: React.PropTypes.string,
}
render() {
return <div
ref={x => this.container = x}
style={{
position: "fixed",
top: 0,
bottom: 0,
height: "100%",
width: "100%",
}}></div>
}
}
-42
View File
@@ -1,42 +0,0 @@
import React from 'react'
import MapboxGl from 'mapbox-gl'
import validateColor from 'mapbox-gl-style-spec/lib/validate/validate_color'
import Map from './Map.jsx'
import style from '../../libs/style.js'
export default class MapboxGlMap extends Map {
static propTypes = {
onMapLoaded: React.PropTypes.func,
}
static defaultProps = {
onMapLoaded: () => {}
}
constructor(props) {
super(props)
this.state = { map: null }
}
componentWillReceiveProps(nextProps) {
if(!this.state.map) return
//Mapbox GL now does diffing natively so we don't need to calculate
//the necessary operations ourselves!
this.state.map.setStyle(nextProps.mapStyle, { diff: true})
}
componentDidMount() {
MapboxGl.accessToken = this.props.accessToken
const map = new MapboxGl.Map({
container: this.container,
style: this.props.mapStyle,
});
map.on("style.load", (...args) => {
this.props.onMapLoaded(map)
this.setState({ map });
});
}
}
-68
View File
@@ -1,68 +0,0 @@
import React from 'react'
import Map from './Map'
import style from '../../libs/style.js'
class OpenLayers3Map extends Map {
constructor(props) {
super(props)
}
componentWillReceiveProps(nextProps) {
require.ensure(["openlayers", "ol-mapbox-style"], ()=> {
const ol = require('openlayers')
const olms = require('ol-mapbox-style')
const jsonStyle = nextProps.mapStyle
const styleFunc = olms.getStyleFunction(jsonStyle, 'openmaptiles', this.resolutions)
console.log('New style babee')
const layer = this.layer
layer.setStyle(styleFunc)
//NOTE: We need to mark the source as changed in order
//to trigger a rerender
layer.getSource().changed()
this.state.map.render()
})
}
componentDidMount() {
//Load OpenLayers dynamically once we need it
//TODO: Make this more convenient
require.ensure(["openlayers", "ol-mapbox-style"], ()=> {
console.log('Loaded OpenLayers3 renderer')
const ol = require('openlayers')
const olms = require('ol-mapbox-style')
const tilegrid = ol.tilegrid.createXYZ({tileSize: 512, maxZoom: 22})
this.resolutions = tilegrid.getResolutions()
this.layer = new ol.layer.VectorTile({
source: new ol.source.VectorTile({
attributions: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors</a>',
format: new ol.format.MVT(),
tileGrid: tilegrid,
tilePixelRatio: 8,
url: 'https://free-0.tilehosting.com/data/v3/{z}/{x}/{y}.pbf?key=tXiQqN3lIgskyDErJCeY'
})
})
const jsonStyle = this.props.mapStyle
const styleFunc = olms.getStyleFunction(jsonStyle, 'openmaptiles', this.resolutions)
this.layer.setStyle(styleFunc)
const map = new ol.Map({
target: this.container,
layers: [this.layer],
view: new ol.View({
center: jsonStyle.center,
zoom: 2,
//zoom: jsonStyle.zoom,
})
})
map.addControl(new ol.control.Zoom());
this.setState({ map });
})
}
}
export default OpenLayers3Map
-49
View File
@@ -1,49 +0,0 @@
import React from 'react'
import CloseIcon from 'react-icons/lib/md/close'
import Overlay from './Overlay'
import colors from '../../config/colors'
import { margins, fontSizes } from '../../config/scales'
class Modal extends React.Component {
static propTypes = {
isOpen: React.PropTypes.bool.isRequired,
title: React.PropTypes.string.isRequired,
onOpenToggle: React.PropTypes.func.isRequired,
}
render() {
return <Overlay isOpen={this.props.isOpen}>
<div style={{
minWidth: 350,
maxWidth: 600,
backgroundColor: colors.black,
boxShadow: '0px 0px 5px 0px rgba(0,0,0,0.3)',
}}>
<div style={{
backgroundColor: colors.gray,
display: 'flex',
flexDirection: 'row',
padding: margins[2],
fontSize: fontSizes[4],
}}>
{this.props.title}
<span style={{flexGrow: 1}} />
<a
onClick={() => this.props.onOpenToggle(false)}
style={{ cursor: 'pointer' }} >
<CloseIcon />
</a>
</div>
<div style={{
padding: margins[2],
}}>
{this.props.children}
</div>
</div>
</Overlay>
}
}
export default Modal
-136
View File
@@ -1,136 +0,0 @@
import React from 'react'
import Modal from './Modal'
import Heading from '../Heading'
import Button from '../Button'
import Paragraph from '../Paragraph'
import FileReaderInput from 'react-file-reader-input'
import request from 'request'
import FileUploadIcon from 'react-icons/lib/md/file-upload'
import AddIcon from 'react-icons/lib/md/add-circle-outline'
import style from '../../libs/style.js'
import colors from '../../config/colors'
import { margins, fontSizes } from '../../config/scales'
import publicStyles from '../../config/styles.json'
class PublicStyle extends React.Component {
static propTypes = {
url: React.PropTypes.string.isRequired,
thumbnailUrl: React.PropTypes.string.isRequired,
title: React.PropTypes.string.isRequired,
onSelect: React.PropTypes.func.isRequired,
}
render() {
return <div style={{
verticalAlign: 'top',
marginTop: margins[2],
marginRight: margins[2],
backgroundColor: colors.gray,
display: 'inline-block',
width: 180,
fontSize: fontSizes[4],
color: colors.lowgray,
}}>
<Button
onClick={() => this.props.onSelect(this.props.url)}
style={{
backgroundColor: 'transparent',
padding: margins[2],
display: 'block',
}}
>
<div style={{
display: 'flex',
flexDirection: 'row',
}}>
<span style={{fontWeight: 700}}>{this.props.title}</span>
<span style={{flexGrow: 1}} />
<AddIcon />
</div>
<img
style={{
display: 'block',
marginTop: margins[1],
maxWidth: '100%',
}}
src={this.props.thumbnailUrl}
alt={this.props.title}
/>
</Button>
</div>
}
}
class OpenModal extends React.Component {
static propTypes = {
isOpen: React.PropTypes.bool.isRequired,
onOpenToggle: React.PropTypes.func.isRequired,
onStyleOpen: React.PropTypes.func.isRequired,
}
onStyleSelect(styleUrl) {
request({
url: styleUrl,
withCredentials: false,
}, (error, response, body) => {
if (!error && response.statusCode == 200) {
const mapStyle = style.ensureMetadataExists(JSON.parse(body))
console.log('Loaded style ', mapStyle.id)
this.props.onStyleOpen(mapStyle)
} else {
console.warn('Could not open the style URL', styleUrl)
}
})
}
onUpload(_, files) {
const [e, file] = files[0];
const reader = new FileReader();
reader.readAsText(file, "UTF-8");
reader.onload = e => {
let mapStyle = JSON.parse(e.target.result)
mapStyle = style.ensureMetadataExists(mapStyle)
this.props.onStyleOpen(mapStyle);
}
reader.onerror = e => console.log(e.target);
}
render() {
const styleOptions = publicStyles.map(style => {
return <PublicStyle
key={style.id}
url={style.url}
title={style.title}
thumbnailUrl={style.thumbnail}
onSelect={this.onStyleSelect.bind(this)}
/>
})
return <Modal
isOpen={this.props.isOpen}
onOpenToggle={this.props.onOpenToggle}
title={'Open Style'}
>
<Heading level={4}>Upload Style</Heading>
<Paragraph>
Upload a JSON style from your computer.
</Paragraph>
<FileReaderInput onChange={this.onUpload.bind(this)}>
<Button>
<FileUploadIcon />
Upload
</Button>
</FileReaderInput>
<Heading level={4}>Gallery Styles</Heading>
<Paragraph>
Open one of the publicly available styles to start from.
</Paragraph>
{styleOptions}
</Modal>
}
}
export default OpenModal
-53
View File
@@ -1,53 +0,0 @@
import React from 'react'
class ViewportOverlay extends React.Component {
static propTypes = {
style: React.PropTypes.object
}
render() {
const overlayStyle = {
position: 'fixed',
top: 0,
right: 0,
bottom: 0,
left: 0,
zIndex: 2,
opacity: 0.875,
backgroundColor: 'rgb(28, 31, 36)',
...this.props.style
}
return <div style={overlayStyle} />
}
}
class Overlay extends React.Component {
static propTypes = {
isOpen: React.PropTypes.bool.isRequired,
children: React.PropTypes.element.isRequired
}
render() {
return <div style={{
top: 0,
right: 0,
bottom: 0,
left: 0,
position: 'fixed',
display: this.props.isOpen ? 'flex' : 'none',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center'
}}>
<ViewportOverlay />
<div style={{
zIndex: 3,
}}>
{this.props.children}
</div>
</div>
}
}
export default Overlay
-85
View File
@@ -1,85 +0,0 @@
import React from 'react'
import InputBlock from '../inputs/InputBlock'
import StringInput from '../inputs/StringInput'
import SelectInput from '../inputs/SelectInput'
import Modal from './Modal'
import colors from '../../config/colors'
class SettingsModal extends React.Component {
static propTypes = {
mapStyle: React.PropTypes.object.isRequired,
onStyleChanged: React.PropTypes.func.isRequired,
isOpen: React.PropTypes.bool.isRequired,
onOpenToggle: React.PropTypes.func.isRequired,
}
constructor(props) {
super(props);
}
onChange(property, e) {
const changedStyle = this.props.mapStyle.set(property, e.target.value)
this.props.onStyleChanged(changedStyle)
}
onRendererChange(renderer) {
const changedStyle = {
...this.props.mapStyle,
metadata: {
...this.props.mapStyle.metadata,
'maputnik:renderer': renderer,
}
}
this.props.onStyleChanged(changedStyle)
}
render() {
const inputProps = { }
return <Modal
isOpen={this.props.isOpen}
onOpenToggle={this.props.onOpenToggle}
title={'StyleSettings'}
>
<InputBlock label={"Name"}>
<StringInput {...inputProps}
value={this.props.mapStyle.name}
onChange={this.onChange.bind(this, "name")}
/>
</InputBlock>
<InputBlock label={"Owner"}>
<StringInput {...inputProps}
value={this.props.mapStyle.owner}
onChange={this.onChange.bind(this, "owner")}
/>
</InputBlock>
<InputBlock label={"Sprite URL"}>
<StringInput {...inputProps}
value={this.props.mapStyle.sprite}
onChange={this.onChange.bind(this, "sprite")}
/>
</InputBlock>
<InputBlock label={"Glyphs URL"}>
<StringInput {...inputProps}
value={this.props.mapStyle.glyphs}
onChange={this.onChange.bind(this, "glyphs")}
/>
</InputBlock>
<InputBlock label={"Style Renderer"}>
<SelectInput {...inputProps}
options={[
['mbgljs', 'MapboxGL JS'],
['ol3', 'Open Layers 3']
]}
value={(this.props.mapStyle.metadata || {})['maputnik:renderer'] || 'mbgljs'}
onChange={this.onRendererChange.bind(this)}
/>
</InputBlock>
</Modal>
}
}
export default SettingsModal
-242
View File
@@ -1,242 +0,0 @@
import React from 'react'
import Modal from './Modal'
import Heading from '../Heading'
import Button from '../Button'
import Paragraph from '../Paragraph'
import InputBlock from '../inputs/InputBlock'
import StringInput from '../inputs/StringInput'
import SelectInput from '../inputs/SelectInput'
import SourceTypeEditor from '../sources/SourceTypeEditor'
import style from '../../libs/style'
import publicSources from '../../config/tilesets.json'
import colors from '../../config/colors'
import { margins, fontSizes } from '../../config/scales'
import AddIcon from 'react-icons/lib/md/add-circle-outline'
import DeleteIcon from 'react-icons/lib/md/delete'
class PublicSource extends React.Component {
static propTypes = {
id: React.PropTypes.string.isRequired,
type: React.PropTypes.string.isRequired,
title: React.PropTypes.string.isRequired,
onSelect: React.PropTypes.func.isRequired,
}
render() {
return <div style={{
verticalAlign: 'top',
marginTop: margins[2],
marginRight: margins[2],
backgroundColor: colors.gray,
display: 'inline-block',
width: 240,
fontSize: fontSizes[4],
color: colors.lowgray,
}}>
<Button
onClick={() => this.props.onSelect(this.props.id)}
style={{
backgroundColor: 'transparent',
padding: margins[2],
display: 'flex',
flexDirection: 'row',
}}
>
<div>
<span style={{fontWeight: 700}}>{this.props.title}</span>
<br/>
<span style={{fontSize: fontSizes[5]}}>#{this.props.id}</span>
</div>
<span style={{flexGrow: 1}} />
<AddIcon />
</Button>
</div>
}
}
function editorMode(source) {
if(source.type === 'geojson') return ' geojson'
if(source.type === 'vector' && source.tiles) {
return 'tilexyz'
}
return 'tilejson'
}
class SourceEditorLayout extends React.Component {
static propTypes = {
sourceId: React.PropTypes.string.isRequired,
source: React.PropTypes.object.isRequired,
onSourceDelete: React.PropTypes.func.isRequired,
onSourceChange: React.PropTypes.func.isRequired,
}
render() {
const inputProps = { }
return <div style={{
}}>
<div style={{
backgroundColor: colors.gray,
color: colors.lowgray,
padding: margins[1],
display: 'flex',
fontSize: fontSizes[4],
flexDirection: 'row',
}}>
<span style={{fontWeight: 700, fontSize: fontSizes[4], lineHeight: 2}}>#{this.props.sourceId}</span>
<span style={{flexGrow: 1}} />
<Button
onClick={this.props.onSourceDelete}
style={{backgroundColor: 'transparent'}}
>
<DeleteIcon />
</Button>
</div>
<div style={{
borderColor: colors.gray,
borderWidth: 2,
borderStyle: 'solid',
padding: margins[1],
}}>
<SourceTypeEditor
onChange={this.props.onSourceChange}
mode={editorMode(this.props.source)}
source={this.props.source}
/>
</div>
</div>
}
}
class AddSource extends React.Component {
static propTypes = {
onSourceAdd: React.PropTypes.func.isRequired,
}
constructor(props) {
super(props)
this.state = {
mode: 'tilejson',
source: {
id: style.generateId(),
}
}
}
onSourceIdChange(newId) {
this.setState({
source: {
...this.state.source,
id: newId,
}
})
}
onSourceChange(source) {
this.setState({
source: source
})
}
render() {
return <div>
<InputBlock label={"Source ID"}>
<StringInput
value={this.state.source.id}
onChange={this.onSourceIdChange.bind(this)}
/>
</InputBlock>
<InputBlock label={"Source Type"}>
<SelectInput
options={[
['geojson', 'GeoJSON'],
['tilejson', 'Vector (TileJSON URL)'],
['tilexyz', 'Vector (XYZ URLs)'],
]}
onChange={v => this.setState({mode: v})}
value={this.state.mode}
/>
</InputBlock>
<SourceTypeEditor
onChange={this.onSourceChange.bind(this)}
mode={this.state.mode}
source={this.state.source}
/>
<Button onClick={() => this.onSourceAdd(this.state.source)}>
Add Source
</Button>
</div>
}
}
class SourcesModal extends React.Component {
static propTypes = {
mapStyle: React.PropTypes.object.isRequired,
isOpen: React.PropTypes.bool.isRequired,
onOpenToggle: React.PropTypes.func.isRequired,
onStyleChanged: React.PropTypes.func.isRequired,
}
onSourceAdd(source) {
const changedSources = {
...this.props.mapStyle.sources,
[source.id]: source
}
const changedStyle = {
...this.props.mapStyle,
sources: changedSources
}
this.props.onStyleChanged(changedStyle)
}
render() {
const activeSources = Object.keys(this.props.mapStyle.sources).map(sourceId => {
const source = this.props.mapStyle.sources[sourceId]
return <SourceEditorLayout
key={sourceId}
sourceId={sourceId}
source={source}
/>
})
const tilesetOptions = publicSources.filter(source => !(source.id in this.props.mapStyle.sources)).map(source => {
return <PublicSource
key={source.id}
id={source.id}
type={source.type}
title={source.title}
description={source.description}
onSelect={() => this.onSourceAdd(source)}
/>
})
const inputProps = { }
return <Modal
isOpen={this.props.isOpen}
onOpenToggle={this.props.onOpenToggle}
title={'Sources'}
>
<Heading level={4}>Active Sources</Heading>
{activeSources}
<Heading level={4}>Add New Source</Heading>
<div style={{maxWidth: 300}}>
<p style={{color: colors.lowgray, fontSize: fontSizes[5]}}>Add a new source to your style. You can only choose the source type and id at creation time!</p>
<AddSource onSourceAdd={this.onSourceAdd.bind(this)} />
</div>
<Heading level={4}>Choose Public Source</Heading>
<Paragraph>
Add one of the publicly availble sources to your style.
</Paragraph>
<div style={{maxwidth: 500}}>
{tilesetOptions}
</div>
</Modal>
}
}
export default SourcesModal
-12
View File
@@ -1,12 +0,0 @@
.darkScrollbar::-webkit-scrollbar {
background-color: #26282e;
width: 5px;
}
.darkScrollbar::-webkit-scrollbar-thumb {
border-radius: 6px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #40444e;
padding-left: 2px;
padding-right: 2px;
}
@@ -1,93 +0,0 @@
import React from 'react'
import InputBlock from '../inputs/InputBlock'
import StringInput from '../inputs/StringInput'
class TileJSONSourceEditor extends React.Component {
static propTypes = {
url: React.PropTypes.string.isRequired,
onChange: React.PropTypes.func,
}
render() {
return <InputBlock label={"TileJSON URL"}>
<StringInput
value={this.props.url}
onChange={this.props.onChange}
/>
</InputBlock>
}
}
class TileURLSourceEditor extends React.Component {
static propTypes = {
tiles: React.PropTypes.array.isRequired,
minZoom: React.PropTypes.number.isRequired,
maxZoom: React.PropTypes.number.isRequired,
onChange: React.PropTypes.func,
}
renderTileUrls() {
const prefix = ['1st', '2nd', '3rd', '4th', '5th', '6th', '7th']
return this.props.tiles.map((tileUrl, tileIndex) => {
return <InputBlock key={tileIndex} label={prefix[tileIndex] + " Tile URL"}>
<StringInput
value={tileUrl}
/>
</InputBlock>
})
}
render() {
console.log(this.props.tiles)
return <div>
{this.renderTileUrls()}
<InputBlock label={"Min Zoom"}>
<StringInput
value={this.props.minZoom}
/>
</InputBlock>
<InputBlock label={"Max Zoom"}>
<StringInput
value={this.props.maxZoom}
/>
</InputBlock>
</div>
}
}
class GeoJSONSourceEditor extends React.Component {
static propTypes = {
data: React.PropTypes.string.isRequired,
onChange: React.PropTypes.func,
}
render() {
return <InputBlock label={"GeoJSON Data"}>
<StringInput
value={this.props.data}
onChange={this.props.onChange}
/>
</InputBlock>
}
}
class SourceTypeEditor extends React.Component {
static propTypes = {
mode: React.PropTypes.string.isRequired,
source: React.PropTypes.object.isRequired,
onChange: React.PropTypes.func.isRequired,
}
render() {
const source = this.props.source
switch(this.props.mode) {
case 'geojson': return <GeoJSONSourceEditor data={source.data || 'http://localhost:3000/mygeojson.json'} />
case 'tilejson': return <TileJSONSourceEditor url={source.url || 'http://localhost:3000/tiles.json'}/>
case 'tilexyz': return <TileURLSourceEditor tiles={source.tiles || ['http://localhost:3000/{x}/{y}/{z}.pbf']} minZoom={source.minZoom || 0} maxZoom={source.maxZoom || 14}/>
default: return null
}
}
}
export default SourceTypeEditor
-29
View File
@@ -1,29 +0,0 @@
const baseColors = {
black: '#1c1f24',
gray: '#26282e',
midgray: '#36383e',
lowgray: '#8e8e8e',
white: '#fff',
blue: '#00d9f7',
green: '#B4C7AD',
orange: '#fb3',
red: '#f04',
}
const themeColors = {
primary: baseColors.gray,
secondary: baseColors.midgray,
default: baseColors.gray,
info: baseColors.blue,
success: baseColors.green,
warning: baseColors.orange,
error: baseColors.red
}
const colors = {
...baseColors,
...themeColors
}
export default colors
-52
View File
@@ -1,52 +0,0 @@
import colors from './colors'
import { margins, fontSizes } from './scales'
const base = {
display: 'inline-block',
fontSize: fontSizes[5],
lineHeight: 2,
paddingLeft: 5,
paddingRight: 5,
}
const label = {
...base,
width: '40%',
color: colors.lowgray,
userSelect: 'none',
}
const property = {
marginTop: margins[2],
marginBottom: margins[2],
}
const input = {
...base,
border: 'none',
width: '47%',
backgroundColor: colors.gray,
color: colors.lowgray,
}
const checkbox = {
...base,
border: '1px solid rgb(36, 36, 36)',
backgroundColor: colors.gray,
color: colors.lowgray,
}
const select = {
...input,
width: '51%',
height: '2.3em',
}
export default {
base,
label,
select,
input,
property,
checkbox,
}
-172
View File
@@ -1,172 +0,0 @@
{
"line": {
"groups": [
{
"title": "Settings",
"type": "settings"
},
{
"title": "Source",
"type": "source"
},
{
"title": "Paint",
"type": "properties",
"fields": [
"line-opacity",
"line-color",
"line-width",
"line-offset",
"line-blur",
"line-pattern"
]
},
{
"title": "Secondary",
"type": "properties",
"fields": [
"line-translate",
"line-translate-anchor",
"line-cap",
"line-join",
"line-miter-limit",
"line-round-limit",
"line-dasharray",
"line-gap-width"
]
},
{
"title": "JSON",
"type": "jsoneditor"
}
]
},
"background": {
"groups": [
{
"title": "Settings",
"type": "settings"
},
{
"title": "Source",
"type": "source"
},
{
"title": "Basic",
"type": "properties",
"fields": [
"background-color",
"background-pattern",
"background-opacity"
]
},
{
"title": "JSON",
"type": "jsoneditor"
}
]
},
"fill": {
"groups": [
{
"title": "Settings",
"type": "settings"
},
{
"title": "Source",
"type": "source"
},
{
"title": "Basic",
"type": "properties",
"fields": [
"fill-opacity",
"fill-color",
"fill-antialias",
"fill-outline-color",
"fill-pattern",
"fill-translate",
"fill-translate-anchor"
]
},
{
"title": "JSON",
"type": "jsoneditor"
}
]
},
"symbol": {
"groups": [
{
"title": "Settings",
"type": "settings"
},
{
"title": "Source",
"type": "source"
},
{
"title": "Basic",
"type": "properties",
"fields": [
"text-field",
"text-font",
"text-size",
"text-line-height"
]
},
{
"title": "Placement",
"type": "properties",
"fields": [
"symbol-placement",
"symbol-spacing",
"symbol-avoid-edges",
"text-padding",
"text-allow-overlap",
"text-ignore-placement"
]
},
{
"title": "Layout",
"type": "properties",
"fields": [
"text-pitch-alignment",
"text-rotation-alignment",
"text-max-width",
"text-letter-spacing",
"text-justify",
"text-anchor",
"text-max-angle",
"text-rotate",
"text-keep-upright",
"text-transform",
"text-offset",
"text-optional"
]
},
{
"title": "Icon",
"type": "properties",
"fields": [
"icon-allow-overlap",
"icon-ignore-placement",
"icon-optional",
"icon-rotation-alignment",
"icon-size",
"icon-text-fit",
"icon-text-fit-padding",
"icon-image",
"icon-rotate",
"icon-padding",
"icon-keep-upright",
"icon-offset"
]
},
{
"title": "JSON",
"type": "jsoneditor"
}
]
}
}
-2
View File
@@ -1,2 +0,0 @@
export const margins = [3, 5, 10, 30, 40]
export const fontSizes = [26, 20, 16, 14, 12, 10]
-38
View File
@@ -1,38 +0,0 @@
[
{
"id": "klokantech-basic",
"title": "Klokantech Basic",
"url": "https://rawgit.com/openmaptiles/klokantech-basic-gl-style/gh-pages/style-cdn.json",
"thumbnail": "https://camo.githubusercontent.com/5cf548fdb9fc606f4a452d14fd2a7a959155fd40/68747470733a2f2f6170692e6d6170626f782e636f6d2f7374796c65732f76312f6d6f7267656e6b61666665652f63697578757465726630316135326971716f366b6f6c776b312f7374617469632f382e3534303538372c34372e3337303535352c31342e30382c302e30302c302e30302f363030783430303f6163636573735f746f6b656e3d706b2e65794a31496a6f69625739795a3256756132466d5a6d566c4969776959534936496a497a636d4e304e6c6b6966512e304c52544e6743632d656e76743964354d7a52373577"
},
{
"id": "dark-matter",
"title": "Dark Matter",
"url": "https://rawgit.com/openmaptiles/dark-matter-gl-style/gh-pages/style-cdn.json",
"thumbnail": "https://camo.githubusercontent.com/b73c515d633d2be7368e8e29e3c23e14117fd21b/68747470733a2f2f6170692e6d6170626f782e636f6d2f7374796c65732f76312f6d6f7267656e6b61666665652f6369757878356e37683031396c326870626e396c6970726d6e2f7374617469632f382e3631393138342c34372e3333363230332c392e30372c302e30302c302e30302f363030783430303f6163636573735f746f6b656e3d706b2e65794a31496a6f69625739795a3256756132466d5a6d566c4969776959534936496a497a636d4e304e6c6b6966512e304c52544e6743632d656e76743964354d7a52373577"
},
{
"id": "positron",
"title": "Positron",
"url": "https://rawgit.com/openmaptiles/positron-gl-style/gh-pages/style-cdn.json",
"thumbnail": "https://camo.githubusercontent.com/0dd866e3fa7b21ada87da69082eac6801e16ec99/68747470733a2f2f6170692e6d6170626f782e636f6d2f7374796c65732f76312f6d6f7267656e6b61666665652f63697578756e37736530313976326a6c387162326a743374662f7374617469632f382e3631393138342c34372e3333363230332c392e30372c302e30302c302e30302f363030783430303f6163636573735f746f6b656e3d706b2e65794a31496a6f69625739795a3256756132466d5a6d566c4969776959534936496a497a636d4e304e6c6b6966512e304c52544e6743632d656e76743964354d7a52373577"
},
{
"id": "osm-bright",
"title": "OSM Bright",
"url": "https://rawgit.com/openmaptiles/osm-bright-gl-style/gh-pages/style-cdn.json",
"thumbnail": "https://camo.githubusercontent.com/a15e23ab59202c56502e57cde963cb7772ed3bb1/68747470733a2f2f6170692e6d6170626f782e636f6d2f7374796c65732f76312f6f70656e6d617074696c65732f63697736637a7a326e30303234326b6d673668773230626f782f7374617469632f382e3534303538372c34372e3337303535352c31342e30382c302e30302c302e30302f363030783430303f6163636573735f746f6b656e3d706b2e65794a31496a6f696233426c626d3168634852706247567a4969776959534936496d4e70646e593365544a785a7a41774d474d796233427064574a6d616a63784e7a636966512e685031427863786c644968616b4d6350534a4c513151"
},
{
"id": "fiord-color",
"title": "Fiord Color",
"url": "https://rawgit.com/openmaptiles/fiord-color-gl-style/gh-pages/style-cdn.json",
"thumbnail": "https://camo.githubusercontent.com/605f2edc30e413b37d16a6ca1d500f265725d76d/68747470733a2f2f6170692e6d6170626f782e636f6d2f7374796c65732f76312f6f70656e6d617074696c65732f6369776775693378353030317732706e7668633063327767302f7374617469632f31302e3938373235382c34362e3435333135302c332e30322c302e30302c302e30302f363030783430303f6163636573735f746f6b656e3d706b2e65794a31496a6f696233426c626d3168634852706247567a4969776959534936496d4e70646e593365544a785a7a41774d474d796233427064574a6d616a63784e7a636966512e685031427863786c644968616b4d6350534a4c513151"
},
{
"id": "toner",
"title": "Toner",
"url": "https://rawgit.com/openmaptiles/toner-color-gl-style/gh-pages/style-cdn.json",
"thumbnail": "https://cloud.githubusercontent.com/assets/1288339/21422755/86ebe96e-c839-11e6-8337-42742dfe34a2.png"
}
]
-9
View File
@@ -1,9 +0,0 @@
import colors from './colors'
import { margins, fontSizes } from './scales'
const dark = {
color: colors.white,
fontFamily: 'Roboto, sans-serif',
}
export default dark
-30
View File
@@ -1,30 +0,0 @@
[
{
"id": "mapbox-streets",
"type": "vector",
"url": "mapbox://mapbox.mapbox-streets-v7",
"title": "Mapbox Streets"
},
{
"id": "tilezen",
"type": "vector",
"tiles": [
"http://tile.mapzen.com/mapzen/vector/v1/{layers}/{z}/{x}/{y}.pbf?api_key=mapzen-RVcyVL7"
],
"minZoom": 0,
"maxZoom": 15,
"title": "Mapzen Vector Tile Service"
},
{
"id": "openmaptiles",
"type": "vector",
"url": "https://free.tilehosting.com/data/v3.json?key=25ItXg7aI5wurYDtttD",
"title": "OpenMapTiles CDN"
},
{
"id": "swissnames-landscape",
"type": "geojson",
"data": "http://swissnames.lukasmartinelli.ch/data/landscape.geojson",
"title": "Landscape Names GeoJSON"
}
]
-17
View File
@@ -1,17 +0,0 @@
@font-face {
font-family: 'Roboto';
src: url('./fonts/Roboto-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
.chrome-picker {
background-color: #1c1f24 !important;
font-family: inherit !important;
}
.chrome-picker input {
background-color: rgb(38, 40, 46) !important;
color: rgb(142, 142, 142) !important;
box-shadow: none !important;
}
-7
View File
@@ -1,7 +0,0 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css'
import App from './components/App';
ReactDOM.render(<App/>, document.querySelector("#app"));
-41
View File
@@ -1,41 +0,0 @@
import request from 'request'
import style from './style.js'
export class ApiStyleStore {
supported(cb) {
request('http://localhost:8000/styles', (error, response, body) => {
cb(error === undefined)
})
}
latestStyle(cb) {
if(this.latestStyleId) {
request('http://localhost:8000/styles/' + this.latestStyleId, (error, response, body) => {
cb(JSON.parse(body))
})
} else {
request('http://localhost:8000/styles', (error, response, body) => {
if (!error && response.statusCode == 200) {
const styleIds = JSON.parse(body);
this.latestStyleId = styleIds[0];
request('http://localhost:8000/styles/' + this.latestStyleId, (error, response, body) => {
cb(style.fromJSON(JSON.parse(body)))
})
}
})
}
}
// Save current style replacing previous version
save(mapStyle) {
const id = mapStyle.get('id')
request.put({
url: 'http://localhost:8000/styles/' + id,
json: true,
body: style.toJSON(mapStyle)
}, (error, response, body) => {
console.log('Saved style');
})
return mapStyle
}
}
-58
View File
@@ -1,58 +0,0 @@
import throttle from 'lodash.throttle'
/** Listens to map events to build up a store of available vector
* layers contained in the tiles */
export default class LayerWatcher {
constructor() {
this._sources = {}
this._vectorLayers = {}
this._map= null
// Since we scan over all features we want to avoid this as much as
// possible and only do it after a batch of data has loaded because
// we only care eventuall about knowing the fields in the vector layers
this.throttledAnalyzeVectorLayerFields = throttle(this.analyzeVectorLayerFields, 5000)
}
/** Set the map as soon as the map is initialized */
set map(m) {
this._map = m
//TODO: At some point we need to unsubscribe when new map is set
this._map.on('data', (e) => {
if(e.dataType !== 'tile') return
//NOTE: This heavily depends on the internal API of Mapbox GL
//so this breaks between Mapbox GL JS releases
this._sources[e.sourceId] = e.style.sourceCaches[e.sourceId]._source.vectorLayerIds
this.throttledAnalyzeVectorLayerFields()
})
}
analyzeVectorLayerFields() {
Object.keys(this._sources).forEach(sourceId => {
this._sources[sourceId].forEach(vectorLayerId => {
const knownProperties = this._vectorLayers[vectorLayerId] || {}
const params = { sourceLayer: vectorLayerId }
this._map.querySourceFeatures(sourceId, params).forEach(feature => {
Object.keys(feature.properties).forEach(propertyName => {
const knownPropertyValues = knownProperties[propertyName] || {}
knownPropertyValues[feature.properties[propertyName]] = {}
knownProperties[propertyName] = knownPropertyValues
})
})
this._vectorLayers[vectorLayerId] = knownProperties
})
})
}
/** Access all known sources and their vector tile ids */
get sources() {
return this._sources
}
get vectorLayers() {
return this._vectorLayers
}
}
-45
View File
@@ -1,45 +0,0 @@
import React from 'react';
import spec from 'mapbox-gl-style-spec/reference/latest.min.js'
// Empty style is always used if no style could be restored or fetched
const emptyStyle = ensureMetadataExists({
version: 8,
sources: {},
layers: [],
})
function generateId() {
return Math.random().toString(36).substr(2, 9)
}
function ensureHasId(style) {
if('id' in style) return style
style.id = generateId()
return style
}
function ensureHasTimestamp(style) {
if('created' in style) return style
style.created = new Date().toJSON()
return style
}
function ensureMetadataExists(style) {
return ensureHasId(ensureHasTimestamp(style))
}
function indexOfLayer(layers, layerId) {
for (let i = 0; i < layers.length; i++) {
if(layers[i].id === layerId) {
return i
}
}
return null
}
export default {
ensureMetadataExists,
emptyStyle,
indexOfLayer,
generateId,
}
-115
View File
@@ -1,115 +0,0 @@
import { colorizeLayers } from './style.js'
import style from './style.js'
import publicSources from '../config/styles.json'
import request from 'request'
const storagePrefix = "maputnik"
const stylePrefix = 'style'
const storageKeys = {
latest: [storagePrefix, 'latest_style'].join(':'),
accessToken: [storagePrefix, 'access_token'].join(':')
}
const defaultStyleUrl = publicSources[0].url
// Fetch a default style via URL and return it or a fallback style via callback
export function loadDefaultStyle(cb) {
console.log('Falling back to default style')
request({
url: defaultStyleUrl,
withCredentials: false,
}, (error, response, body) => {
if (!error && response.statusCode == 200) {
cb(style.ensureMetadataExists(JSON.parse(body)))
} else {
console.warn('Could not fetch default style', styleUrl)
cb(style.emptyStyle)
}
})
}
// Return style ids and dates of all styles stored in local storage
function loadStoredStyles() {
const styles = []
for (let i = 0; i < window.localStorage.length; i++) {
const key = window.localStorage.key(i)
if(isStyleKey(key)) {
styles.push(fromKey(key))
}
}
return styles
}
function isStyleKey(key) {
const parts = key.split(":")
return parts.length == 3 && parts[0] === storagePrefix && parts[1] === stylePrefix
}
// Load style id from key
function fromKey(key) {
if(!isStyleKey(key)) {
throw "Key is not a valid style key"
}
const parts = key.split(":")
const styleId = parts[2]
return styleId
}
// Calculate key that identifies the style with a version
function styleKey(styleId) {
return [storagePrefix, stylePrefix, styleId].join(":")
}
// Store style independent settings
export class SettingsStore {
get accessToken() {
const token = window.localStorage.getItem(storageKeys.accessToken)
return token ? token : ""
}
set accessToken(val) {
window.localStorage.setItem(storageKeys.accessToken, val)
}
}
// Manages many possible styles that are stored in the local storage
export class StyleStore {
// Tile store will load all items from local storage and
// assume they do not change will working on it
constructor() {
this.mapStyles = loadStoredStyles()
}
supported(cb) {
cb(window.localStorage !== undefined)
}
// Delete entire style history
purge() {
for (let i = 0; i < window.localStorage.length; i++) {
const key = window.localStorage.key(i)
if(key.startsWith(storagePrefix)) {
window.localStorage.removeItem(key)
}
}
}
// Find the last edited style
latestStyle(cb) {
if(this.mapStyles.length === 0) return loadDefaultStyle(cb)
const styleId = window.localStorage.getItem(storageKeys.latest)
const styleItem = window.localStorage.getItem(styleKey(styleId))
if(styleItem) return cb(JSON.parse(styleItem))
loadDefaultStyle(cb)
}
// Save current style replacing previous version
save(mapStyle) {
mapStyle = style.ensureMetadataExists(mapStyle)
const key = styleKey(mapStyle.id)
window.localStorage.setItem(key, JSON.stringify(mapStyle))
window.localStorage.setItem(storageKeys.latest, mapStyle.id)
return mapStyle
}
}
-11
View File
@@ -1,11 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title><%= htmlWebpackPlugin.options.title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<div id="app">Loading...</div>
</body>
</html>
-16
View File
@@ -1,16 +0,0 @@
import { SettingsStore } from '../src/stylestore.js'
import assert from 'assert'
describe('SettingsStore', () => {
const store = new SettingsStore()
it('#get should return access token from local storage', () => {
window.localStorage.setItem('maputnik:access_token', 'OLD_TOKEN')
assert.equal(store.accessToken, 'OLD_TOKEN')
})
it('#set should set access token in local storage', () => {
store.accessToken = 'NEW_TOKEN'
assert.equal(window.localStorage.getItem('maputnik:access_token'), 'NEW_TOKEN')
})
})

Some files were not shown because too many files have changed in this diff Show More