-
-
Notifications
You must be signed in to change notification settings - Fork 8
Add preliminary tile loading #142
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
c34fe01
Add preliminary vector tile loading
danirabbit ba48ca9
Use elementary palette colors
danirabbit 9a36025
Roboto → Inter
danirabbit 59a6695
Fix river text color
danirabbit 67963d4
Merge branch 'main' into danirabbit/map-tiles
danirabbit f7a2318
merge main
danirabbit be36ecf
Start building with Json.Builder
danirabbit f398f64
Super basic styles
danirabbit d5bfe21
Labels
danirabbit 252d7a7
Start to use gobject_serialize
danirabbit 10790cd
Deal with layers array
danirabbit 5c8d589
Dirty hacks to replace type
danirabbit 6245a46
cleanups and fix zoom error
danirabbit b1b67da
More cleanup
danirabbit 166ab19
Add more detail
danirabbit de2fac3
comments, min zoom
danirabbit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| ## Code License | ||
|
|
||
| The Mapbox GL Style JSON file is originally derived from [OSM Bright from Mapbox Open Styles](https://github.com/mapbox/mapbox-gl-styles/blob/master/LICENSE.md). The modified Mapbox GL Style JSON retains the same BSD license. | ||
|
|
||
| > Redistribution and use in source and binary forms, with or without modification, | ||
| are permitted provided that the following conditions are met: | ||
|
|
||
| > * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. | ||
| * Neither the name of Mapbox nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. | ||
|
|
||
| > THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| ## Design License | ||
|
|
||
| The look and feel of the OSM liberty map design is also derived (although heavily altered) from [OSM Bright from Mapbox Open Styles](https://github.com/mapbox/mapbox-gl-styles/blob/master/LICENSE.md) which is licensed under the Creative Commons Attribution 3.0 license. | ||
|
|
||
| The map is displaying and styling the data from [OpenMapTiles](https://openmaptiles.org/) with [CC-BY 4.0 design license](https://github.com/openmaptiles/openmaptiles/blob/master/LICENSE.md). | ||
|
|
||
| The products or services using this map style need to visibly credit "OpenMapTiles.org" or reference "OpenMapTiles" with a link to http://openmaptiles.org/. For a browsable electronic map based on OpenMapTiles and OpenStreetMap data, the credit should appear in the corner of the map. For example: | ||
|
|
||
| [© OpenMapTiles](https://openmaptiles.org/) | ||
| [© OpenStreetMap contributors](https://www.openstreetmap.org/copyright) | ||
|
|
||
| For printed and static maps a similar attribution should be made in a textual description near the image, in the same fashion as if you cite a photograph. | ||
|
|
||
| ## Icons | ||
|
|
||
| OSM Liberty is using the [Maki POI icon set](https://github.com/mapbox/maki/blob/master/LICENSE.txt) which is licensed under CC0 1.0 Universal. | ||
|
|
||
| The right arrow was derived from [Wikipedia][wiki_arrow] which is in the public domain. | ||
|
|
||
| [wiki_arrow]: https://commons.wikimedia.org/wiki/File:Arrowright.svg | ||
|
|
||
| ## Fonts | ||
|
|
||
| OSM Liberty is using the Roboto font family (Copyright 2011 Google). | ||
| Roboto is licensed under the [Apache License, Version 2.0](https://github.com/google/roboto/blob/master/LICENSE). | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # OSM Liberty style | ||
|
|
||
| This is the vector style used in the demo. It is taken from | ||
| <https://github.com/maputnik/osm-liberty> at commit [539d0525](https://github.com/maputnik/osm-liberty/commit/539d0525421eb5be901ede630c49947dfe5a343f), | ||
| with a few modifications: | ||
|
|
||
| - Removed the Natural Earth raster layer, since libshumate doesn't support that | ||
| yet | ||
| - Removed the 3D buildings layer, since libshumate doesn't support fill-extrusion | ||
| layers yet | ||
| - Changed the tile source URL | ||
|
|
||
| OSM Liberty is covered by several licenses. See LICENSE.md, which is copied | ||
| from the upstream repository. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was changed to Inter, but we're not shipping Inter here, so I don't think we need this