Changeset 13272 in josm

Timestamp:

2018-01-02T14:28:20+01:00 (6 years ago)

Author:

stoecker

Message:

see #15713 - rename dirty mode

Location:

trunk

Files:

• data/maps.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (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" />
+                            <!-- does imagery server supports "/status" and tile re-rendering using "/dirty". Defaults to false. -->
+                            <xs:element name="mod-tile-features" minOccurs="0" maxOccurs="1" type="xs:boolean" />
                         </xs:choice>
                     </xs:sequence>

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -514 +514 @@
                 Objects.equals(this.id, other.id) &&
                 Objects.equals(this.url, other.url) &&
-                Objects.equals(this.dirtyMode, other.dirtyMode) &&
+                Objects.equals(this.modTileFeatures, other.modTileFeatures) &&
                 Objects.equals(this.bestMarked, other.bestMarked) &&
                 Objects.equals(this.isGeoreferenceValid, other.isGeoreferenceValid) &&

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.isDirtyMode()) {
+            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.isModTileFeatures()) {
                 add(new JMenuItem(new GetOsmTileStatusAction()));
                 add(new JMenuItem(new MarkOsmTileDirtyAction()));

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

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