Changeset 13266 in josm

Timestamp:

2018-01-01T18:05:22+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15713 - Add dirty-mode to TMS imagery sources

Location:

trunk

Files:

• data/maps.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (2 diffs)

trunk/data/maps.xsd

@@ -701 +701 @@
                             <!-- does imagery server supports JOSM 4326 to 3857 reprojection and non-square queries. Affects showing warnings. -->
                             <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+                            <!-- does imagery server supports tile re-rendering using "/dirty". Defaults to false. -->
+                            <xs:element name="dirty-mode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
                         </xs:choice>
                     </xs:sequence>

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -616 +616 @@
             add(new JMenuItem(new LoadTileAction()));
             add(new JMenuItem(new ShowTileInfoAction()));
-            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.getBaseUrl() != null
-                    && tileSource.getBaseUrl().contains(".tile.openstreetmap.org/")) {
+            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.isDirtyMode()) {
                 add(new JMenuItem(new GetOsmTileStatusAction()));
                 add(new JMenuItem(new MarkOsmTileDirtyAction()));

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -207 +207 @@
                         "date",
                         TILE_SIZE,
-                        "valid-georeference"
+                        "valid-georeference",
+                        "dirty-mode"
                 ).contains(qName)) {
                     newState = State.ENTRY_ATTRIBUTE;
@@ -471 +472 @@
                     entry.setGeoreferenceValid(Boolean.parseBoolean(accumulator.toString()));
                     break;
+                case "dirty-mode":
+                    entry.setDirtyMode(Boolean.parseBoolean(accumulator.toString()));
+                    break;
                 default: // Do nothing
                 }