Skip to content

Commit cc3db05

Browse files
Merge branch 'upstream-main' into omt_3_15_0
2 parents 206ca85 + 792ce68 commit cc3db05

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/maven.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
cache: 'maven'
7070
- run: ./scripts/regenerate-openmaptiles.sh
7171
# Skip spotless since that gets checked in a separate task
72-
- run: ./mvnw -Dspotless.check.skip --batch-mode -no-transfer-progress clean verify
72+
- run: ./mvnw -DskipTests -Dspotless.check.skip --batch-mode -no-transfer-progress clean verify
7373

7474
run:
7575
name: Build / Run
@@ -138,4 +138,4 @@ jobs:
138138
working-directory: planetiler
139139
run: ./scripts/test-release.sh CI_ONLY
140140
env:
141-
SKIP_EXAMPLE_PROJECT: true
141+
SKIP_EXAMPLE_PROJECT: true

.github/workflows/performance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
continue-on-error: true
2424
steps:
2525
- name: 'Cancel previous runs'
26-
uses: styfle/[email protected].0
26+
uses: styfle/[email protected].1
2727
with:
2828
access_token: ${{ github.token }}
2929

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ the [layers package](src/main/java/org/openmaptiles/layers), and make a change t
4545
Example adding an attribute to a built-in layer
4646
</summary>
4747

48-
For example to copy over the source attribute from OpenStreetMap elements to the building layer,
48+
For example to copy over the name attribute from OpenStreetMap elements to the building layer,
4949
modify [Building.java](src/main/java/org/openmaptiles/layers/Building.java):
5050

5151
```diff
5252
@@ -166,6 +166,7 @@ public class Building implements
5353
.setAttrWithMinzoom(Fields.RENDER_MIN_HEIGHT, renderMinHeight, 14)
5454
.setAttrWithMinzoom(Fields.COLOUR, color, 14)
5555
.setAttrWithMinzoom(Fields.HIDE_3D, hide3d, 14)
56-
+ .setAttrWithMinzoom("source", element.source().getTag("source"), 14)
56+
+ .setAttrWithMinzoom("name", element.source().getTag("name"), 14)
5757
.setSortKey(renderHeight);
5858
if (mergeZ13Buildings) {
5959
feature

0 commit comments

Comments
 (0)