editor

ashatora/editor

Fork 0

mirror of https://github.com/maputnik/editor.git synced 2026-08-28 16:07:28 +00:00

...

Author SHA1 Message Date

Harel M 6c9b8583a0 Merge branch 'main' into feature/local_styles 2024-11-06 13:08:48 +02:00

Author	SHA1	Message	Date
Harel M	6c9b8583a0	Merge branch 'main' into feature/local_styles	2024-11-06 13:08:48 +02:00
Filip Czaplicki	dd6b40c943	Use printf for generating version.go (#933 ) Flag -e is to "enable interpretation of backslash escapes" Which might be a default, depends on a shell. `sh -c 'echo "a\nb"'` on my OS prints > a\nb (no newline) ## Launch Checklist <!-- Thanks for the PR! Feel free to add or remove items from the checklist. --> - [x] Briefly describe the changes in this PR.	2024-10-31 15:07:24 -04:00
Rob Labs	687f9abaf2	[user interface]: Use `.png` as the XYZ Tile URL format hint for raster & raster-dem tiles (#952 ) ## Launch Checklist - [x] Briefly describe the changes in this PR. * When adding a new Raster or Raster-dem tile source, use `.png` as the hint for the tile URL hint prompt. * Currently, the user is prompted for a Vector tile source (e.g., `.pbf`) * If a new Mapnik user already has their XYZ raster Tile URL, then they may already know how to modify this text field. * This change may be useful for new users and is intended for them. * `.png` is a start. It could be `.webp` or `.jpg`, or `.jpg`, or in the case of Esri there is no extension for the images. * See [RobLabs.com/xyz](https://RobLabs.com/xyz) for sample XYZ raster tile URLs --- - [x] Include before/after visuals or gifs if this PR includes visual changes. * Steps to reproduce * See [RobLabs.com/maputnik](https://roblabs.com/maputnik) for a working version of this fix for Maputnik * On top menu bar: Data Sources > In the Add New Source section > Change Source Type to "Raster (Tile URLs)" * There you will see prompt hint for a raster Tile instead of vector tile `.pbf`. * See the release notes for the National Park Service prototype release for [Maputnik for National Park Service Park Tiles](https://github.com/roblabs/maputnik/releases/tag/v2.1.1-nationalparkservice) for more screen shots. #### Before `.pbf` may be confusing for those adding a Raster ![image](https://github.com/user-attachments/assets/f3869f2e-b2d6-4339-807d-7c14ddfecd29) #### After ![image](https://github.com/user-attachments/assets/2bb06206-23c2-467c-981d-f939a9525d3d) --- - [x] Write tests for all new functionality. * See screen shots for functionality - ~~[] Add an entry to `CHANGELOG.md` under the `## main` section.~~ Not really a feature, so I will leave this out - [ ] ~~Link to related issues.~~	2024-10-31 21:03:35 +02:00

Filip Czaplicki

dd6b40c943

Use printf for generating version.go (#933 )

Flag -e is to "enable interpretation of backslash escapes"
Which might be a default, depends on a shell.

`sh -c 'echo "a\nb"'` on my OS prints
> a\nb

(no newline)

## Launch Checklist

<!-- Thanks for the PR! Feel free to add or remove items from the
checklist. -->
 - [x] Briefly describe the changes in this PR.

2024-10-31 15:07:24 -04:00

Rob Labs

687f9abaf2

[user interface]: Use .png as the XYZ Tile URL format hint for raster & raster-dem tiles (#952 )

## Launch Checklist

 - [x] Briefly describe the changes in this PR.

* When adding a new Raster or Raster-dem tile source, use `.png` as the
hint for the tile URL hint prompt.
* Currently, the user is prompted for a Vector tile source (e.g.,
`.pbf`)
* If a new Mapnik user already has their XYZ raster Tile URL, then they
may already know how to modify this text field.
* This change may be useful for new users and is intended for them.
* `.png` is a start. It could be `.webp` or `.jpg`, or `.jpg`, or in the
case of Esri there is no extension for the images.
* See [RobLabs.com/xyz](https://RobLabs.com/xyz) for sample XYZ raster
tile URLs

---

- [x] Include before/after visuals or gifs if this PR includes visual
changes.
* Steps to reproduce
* See [RobLabs.com/maputnik](https://roblabs.com/maputnik) for a working
version of this fix for Maputnik
* On top menu bar: *Data Sources* > In the *Add New Source* section >
Change *Source Type* to "Raster (Tile URLs)"
* There you will see prompt hint for a raster Tile instead of vector
tile `.pbf`.
* See the release notes for the National Park Service prototype release
for [Maputnik for National Park Service Park
Tiles](https://github.com/roblabs/maputnik/releases/tag/v2.1.1-nationalparkservice)
for more screen shots.

#### Before

`.pbf` may be confusing for those adding a Raster


![image](https://github.com/user-attachments/assets/f3869f2e-b2d6-4339-807d-7c14ddfecd29)

#### After


![image](https://github.com/user-attachments/assets/2bb06206-23c2-467c-981d-f939a9525d3d)

---

 - [x] Write tests for all new functionality.
 * See screen shots for functionality
 - ~~[] Add an entry to `CHANGELOG.md` under the `## main` section.~~
 *Not really a feature, so I will leave this out*
 - [ ] ~~Link to related issues.~~

2024-10-31 21:03:35 +02:00

1 changed files with 3 additions and 3 deletions

									
										desktop/Makefile
									
		+3
		-3
	
												View File
												
				@@ -32,9 +32,9 @@ $(GOBIN)/rice:

				# Embed the current version number in the executable by writing version.go

				.PHONY: version.go

				version.go:

					@echo "// DO NOT EDIT: Autogenerated by Makefile\n" > version.go

					@echo "package main\n" >> version.go

					@echo "const Version = \"$(VERSION)\"" >> version.go

					@printf "// DO NOT EDIT: Autogenerated by Makefile\n" > version.go

					@printf "package main\n" >> version.go

					@printf "const Version = \"$(VERSION)\"\n" >> version.go

				rice-box.go: $(GOBIN)/rice editor/pull_release

					$(GOBIN)/rice embed-go

Compare commits

3 Commits

7179787b46 ... 6c9b8583a0

Compare commits

3 Commits 7179787b46 ... 6c9b8583a0

3 Commits

7179787b46 ... 6c9b8583a0