schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2025-01-01 06:38:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
879 commits 2 branches 0 tags 36 MiB
Commit graph

602 commits

Author SHA1 Message Date
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
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
89c38991b9 Added guard to <LayerSourceLayerBlock/> sourceLayerIds 2018-01-29 17:18:30 +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
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
2e79a8ff4c Added guard to getSources 2018-01-20 09:39:18 +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
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
dc40ce7d9e Fixed lint errors. 2018-01-17 17:58:01 +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
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
orangemug
61808d5939 Fixed lint errors. 2017-11-29 15:03:37 +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
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
9ea5d213f7 Merge remote-tracking branch 'upstream/master' into fix/tooltip-pointer-events 2017-11-16 13:06:40 +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
Orange Mug
616f45c586
Merge pull request #191 from orangemug/fix/console-errors 
Fixed startup errors/warnings
 2017-11-07 15:05:16 +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
b5ca0fa17b Updated webpack deps. 2017-11-07 11:05:30 +00:00
orangemug
c050b02b8b Updated '@mapbox/mapbox-gl-style-spec' 2017-11-07 10:21:39 +00:00
orangemug
9bc603a510 Update to use prop-types module in components. 2017-11-06 15:32:04 +00:00
orangemug
365a0518a5 Removed the console.warn because the logging wasn't helpful. 2017-11-06 15:05:00 +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
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
pjsier
d32b15d425 Assigning default function type from spec 2017-10-16 14:19:19 -05: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
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
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
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
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
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
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
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
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
bartvde
e4477db413 Prevent warning for ColorField 2017-06-23 16:00:43 +02: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
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
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
orangemug
c3174a0c72 Moved to using @mapbox/mapbox-gl-style-spec 2017-04-10 13:29:57 +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
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
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
5433a4193b Move from mapbox-gl-style-spec -> mapbox-gl. 2017-03-22 10:36:20 +00: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
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