@vertigis/viewer-spec 51.11.2 → 51.13.0

package/messaging/registry/drawing.d.ts

@@ -1,4 +1,4 @@
-import type Geometry from "@arcgis/core/geometry/Geometry";
+import type Geometry from "@arcgis/core/geometry/Geometry.js";
 import type LineSymbol3D from "@arcgis/core/symbols/LineSymbol3D";
 import type PictureFillSymbol from "@arcgis/core/symbols/PictureFillSymbol";
 import type PictureMarkerSymbol from "@arcgis/core/symbols/PictureMarkerSymbol";
@@ -22,7 +22,7 @@ import type { Command } from "../Command.js";
 import { CommandRegistry } from "../CommandRegistry.js";
 import type { Operation } from "../Operation.js";
 import { OperationRegistry } from "../OperationRegistry.js";
-import type { CreateGraphicsResult, GeometryLike, HasFeatures, HasGraphics, HasLayers, HasMaps, HasSymbol, HasUITarget, SymbolLike } from "../common.js";
+import type { CreateGraphicsResult, FeaturesLike, GeometryLike, HasFeatures, HasGraphics, HasLayers, HasMaps, HasSymbol, HasUITarget, SymbolLike } from "../common.js";
 import type { CaptureGeometryArgs } from "./sketching.js";
 /**
  * Symbols supported for drawing.
@@ -76,19 +76,23 @@ export interface EditSymbolResult extends HasMaps, HasLayers, HasGraphics, HasFe
     symbol: Symbol;
 }
 /**
- * Arguments for the "drawing.create-graphics" operation. Only available in
- * Mobile.
+ * Arguments for the "drawing.create-graphics" operation. `GeometryLike`,
+ * `FeaturesLike` and `SymbolLike` are only available in Web.
  */
-export interface CreateGraphicsArgs {
+export interface CreateGraphicsArgs extends HasMaps {
     /**
      * The geometry that was captured.
      */
-    geometry: Geometry;
+    geometry: Geometry | GeometryLike;
+    /**
+     * Features containing geometry to create graphics from. Web only.
+     */
+    features?: FeaturesLike;
     /**
      * The symbol that should be used to create the graphic. If null, a default
      * is provided.
      */
-    symbol?: Symbol;
+    symbol?: Symbol | SymbolLike;
 }
 export declare class DrawingCommands extends CommandRegistry {
     /**
@@ -126,8 +130,8 @@ export declare class DrawingOperations extends OperationRegistry {
     /**
      * Creates graphics.
      *
-     * In Web, creates graphics out of GeometryLike args, with the current
-     * symbols that are set on the DrawManager.
+     * In Web, creates graphics out of GeometryLike or CreateGraphicsArgs, with
+     * the current symbols that are set on the DrawManager.
      *
      * In Mobile, creates graphics from the given CreateGraphicsArgs or
      * CreateGraphicsArgs[] (or some GeometryLike args). Any provided symbol

package/messaging/registry/map.d.ts

@@ -26,6 +26,10 @@ import type { Features, FeaturesLike, Geometries, GeometryLike, GraphicsLike, Ha
 import type { EnhancedFileData } from "./file.js";
 import type { PortalItemData } from "./portal.js";
 import type { GeometryEditorSettings } from "./sketching.js";
+/**
+ * Levels (z-orders) to which markup can be assigned, listed from high to low.
+ */
+export type MarkupLevel = "ui" | "labels" | "custom3" | "custom2" | "custom1" | "default";
 /**
  * Arguments for the various map events.
  */
@@ -141,19 +145,88 @@ export interface GetExtentResult {
      */
     maps: MapsLike;
 }
+/**
+ * Base arguments for markup commands and operations.
+ */
+export interface MarkupArgs extends HasMaps {
+    /**
+     * The named collection of markup to operate on. If not specified the
+     * default markup collection will be used. Some markup collection names are
+     * used internally by Web:
+     *
+     * "default": The default markup layer.
+     *
+     * "vgs-active-snapping-guides": The active snap point when snapping.
+     *
+     * "vgs-buffer": Buffer graphics from OOTB buffer tools.
+     *
+     * "vgs-context-marker": Right click context marker on map.
+     *
+     * "vgs-dirty-indicator": Invalid geometry indicators used when editing.
+     *
+     * "vgs-editing-control": Edit frame and vertices while editing geometries.
+     *
+     * "vgs-location-accuracy": Location accuracy circle when geolocating.
+     *
+     * "vgs-location-marker-*": Location markers have this prefix followed by
+     * the marker id.
+     *
+     * "vgs-map-notes": Map Notes.
+     *
+     * "vgs-measurement-labels": Labels on measured graphics.
+     *
+     * "vgs-other-snapping-guides": Additional snapping point visualizations.
+     *
+     * "vgs-self-snaps": Used internally by snapping.
+     *
+     * "vgs-sketching": Temporary graphics used while drawing geometries.
+     *
+     * "vgs-snapping-radius": Snapping radius when snapping is active.
+     *
+     * "vgs-transient-measurement-labels": Measurement labels used while
+     * drawing.
+     *
+     * @webOnly
+     */
+    collection?: string;
+}
+/**
+ * Arguments for the "map.add-markup" command.
+ */
+export interface AddMarkupArgs extends MarkupArgs {
+    /**
+     * The markup to add to the map. `GraphicsLike` is only available in Web.
+     */
+    graphics?: Graphic[] | GraphicsLike;
+    /**
+     * The level (z-order) to assign the markup to. If not specified uses the
+     * same level as default markup.
+     *
+     * @webOnly
+     */
+    level?: MarkupLevel;
+}
+/**
+ * Arguments for the "map.clear-markup" command.
+ *
+ * @webOnly
+ */
+export interface ClearMarkupArgs extends MarkupArgs {
+    /**
+     * The markup to clear. If not specified will clear all markup in the
+     * selected collection.
+     */
+    graphics?: GraphicsLike;
+}
 /**
  * Arguments for the "map.get-markup" operation.
  */
-export interface GetMarkupArgs {
+export interface GetMarkupArgs extends MarkupArgs {
     /**
      * The geometry used to bound the retrieved markup. If not specified all
-     * markup will be returned.
+     * markup in the selected collection will be returned.
      */
     geometry?: Geometry;
-    /**
-     * The associated map for the retrieved extent.
-     */
-    maps: MapsLike;
 }
 /**
  * Result of the "map.get-markup" operation.
@@ -621,15 +694,6 @@ export interface StartSketchArgs {
      */
     symbol?: SymbolJson;
 }
-/**
- * Arguments for the "map.add-markup" operation. Only available in Mobile.
- */
-export interface AddMarkupArgs {
-    /**
-     * The graphics to add to the map.
-     */
-    graphics: Graphic[];
-}
 /**
  * Result of the "map.get-coordinate-transformation" operation.
  */
@@ -704,10 +768,6 @@ export declare enum MarkupType {
 export declare class MapCommands extends CommandRegistry {
     /**
      * Adds markup to the map(s).
-     *
-     * In Web, uses GraphicsLike args.
-     *
-     * In Mobile, uses AddMarkupArgs or some GraphicsLike args.
      */
     get addMarkup(): Command<AddMarkupArgs | GraphicsLike>;
     /**
@@ -758,7 +818,7 @@ export declare class MapCommands extends CommandRegistry {
     /**
      * Clears all markup from the map(s).
      */
-    get clearMarkup(): Command<Maps | void>;
+    get clearMarkup(): Command<ClearMarkupArgs | void>;
     /**
      * Disables the click event handler on the map, so that if the user clicks
      * on the map, the configured handler will not be invoked.
@@ -826,6 +886,13 @@ export declare class MapCommands extends CommandRegistry {
      * @mobileOnly
      */
     get hideExtentSelector(): Command<HasMaps>;
+    /**
+     * Show the specified markup collection, if hidden. If no collection is
+     * specified the default markup collection will be shown.
+     *
+     * @webOnly
+     */
+    get hideMarkup(): Command<MarkupArgs | void>;
     /**
      * Pans (without zooming) to one or many features on the targeted map(s).
      */
@@ -898,6 +965,13 @@ export declare class MapCommands extends CommandRegistry {
      * @webOnly
      */
     get setViewMode(): Command<ViewMode | SetViewModeArgs>;
+    /**
+     * Show the specified markup collection, if hidden. If no collection is
+     * specified the default markup collection will be shown.
+     *
+     * @webOnly
+     */
+    get showMarkup(): Command<MarkupArgs | void>;
     /**
      * Updates a layer in the map.
      *

package/messaging/registry/map.js

@@ -1 +1 @@
-import{CommandRegistry as e}from"../CommandRegistry.js";import{EventRegistry as t}from"../EventRegistry.js";import{OperationRegistry as s}from"../OperationRegistry.js";export var MarkupType;!function(e){e.UNKNOWN="Unknown",e.POLYGON="Polygon",e.POLYLINE="Polyline",e.TEXT="Text",e.PICTURE_MARKER="PictureMarker",e.PICTURE_FILL="PictureFill",e.COMPOSITE="Composite",e.MULTI="Multi"}(MarkupType||(MarkupType={}));export class MapCommands extends e{get addMarkup(){return this._messages.command("map.add-markup")}get addLayers(){return this._messages.command("map.add-layers")}get applyFilterEffect(){return this._messages.command("map.apply-filter-effect")}get applyLayerPreset(){return this._messages.command("map.apply-layer-preset")}get createNote(){return this._messages.command("map.create-note")}get editNote(){return this._messages.command("map.edit-note")}get removeFilterEffects(){return this._messages.command("map.remove-filter-effects")}get clearFilterEffects(){return this._messages.command("map.clear-filter-effects")}get clearMarkup(){return this._messages.command("map.clear-markup")}get disableMapClick(){return this._messages.command("map.disable-map-click")}get displayExtentSelector(){return this._messages.command("map.display-extent-selector")}get enableMapClick(){return this._messages.command("map.enable-map-click")}get goToFeatures(){return this._messages.command("map.go-to-features")}get goToGeometry(){return this._messages.command("map.go-to-geometry")}get goToViewpoint(){return this._messages.command("map.go-to-viewpoint")}get goToScale(){return this._messages.command("map.go-to-scale")}get goToInitialViewpoint(){return this._messages.command("map.go-to-initial-viewpoint")}get goToLayerExtent(){return this._messages.command("map.go-to-layer-extent")}get hideExtentSelector(){return this._messages.command("map.hide-extent-selector")}get panToFeatures(){return this._messages.command("map.pan-to-features")}get panToGeometry(){return this._messages.command("map.pan-to-geometry")}get pauseSketch(){return this._messages.command("map.pause-sketch")}get removeLayers(){return this._messages.command("map.remove-layers")}get replace(){return this._messages.command("map.replace")}get replaceAdditionalLayers(){return this._messages.command("map.replace-additional-layers")}get replaceMmpk(){return this._messages.command("map.replace-mmpk")}get resumeSketch(){return this._messages.command("map.resume-sketch")}get rotateBy(){return this._messages.command("map.rotate-by")}get rotateTo(){return this._messages.command("map.rotate-to")}get refresh(){return this._messages.command("map.refresh")}get setViewMode(){return this._messages.command("map.set-view-mode")}get updateLayer(){return this._messages.command("map.update-layer")}get zoomToFeatures(){return this._messages.command("map.zoom-to-features")}get zoomToGeometry(){return this._messages.command("map.zoom-to-geometry")}get zoomIn(){return this._messages.command("map.zoom-in")}get zoomOut(){return this._messages.command("map.zoom-out")}get zoomToScale(){return this._messages.command("map.zoom-to-scale")}get zoomToInitialViewpoint(){return this._messages.command("map.zoom-to-initial-viewpoint")}get zoomToViewpoint(){return this._messages.command("map.zoom-to-viewpoint")}get zoomToLayerExtent(){return this._messages.command("map.zoom-to-layer-extent")}get zoomToLayerVisibleScale(){return this._messages.command("map.zoom-to-layer-visible-scale")}}export class MapEvents extends t{get initialized(){return this._messages.event("map.initialized")}get initializing(){return this._messages.event("map.initializing")}get markupAdded(){return this._messages.event("map.markup-added")}get markupCleared(){return this._messages.event("map.markup-cleared")}get navigationCompleted(){return this._messages.event("map.navigation-completed")}get refreshed(){return this._messages.event("map.refreshed")}get refreshing(){return this._messages.event("map.refreshing")}get rotated(){return this._messages.event("map.rotated")}get rotating(){return this._messages.event("map.rotating")}get switched(){return this._messages.event("map.switched")}get viewModeChanged(){return this._messages.event("map.view-mode-changed")}get viewpointChanged(){return this._messages.event("map.viewpoint-changed")}get imageExported(){return this._messages.event("map.image-exported")}}export class MapOperations extends s{get getUserCoordinatesInput(){return this._messages.operation("map.get-user-coordinates-input")}get getCoordinateTransformation(){return this._messages.operation("map.get-coordinate-transformation")}get exportImage(){return this._messages.operation("map.export-image")}get exportWebMapOrScene(){return this._messages.operation("map.export-web-map-or-scene")}get getMarkup(){return this._messages.operation("map.get-markup")}get getExtent(){return this._messages.operation("map.get-extent")}get getGeometryFromSelector(){return this._messages.operation("map.get-geometry-from-selector")}get getInitialViewpoint(){return this._messages.operation("map.get-initial-viewpoint")}get getViewpoint(){return this._messages.operation("map.get-viewpoint")}get getSpatialReference(){return this._messages.operation("map.get-spatial-reference")}get getVisibleCenter(){return this._messages.operation("map.get-visible-center")}get hide(){return this._messages.operation("map.hide")}get show(){return this._messages.operation("map.show")}get startSketch(){return this._messages.operation("map.start-sketch")}get stopSketch(){return this._messages.operation("map.stop-sketch")}get getViewInsets(){return this._messages.operation("map.get-view-insets")}}
+import{CommandRegistry as e}from"../CommandRegistry.js";import{EventRegistry as t}from"../EventRegistry.js";import{OperationRegistry as s}from"../OperationRegistry.js";export var MarkupType;!function(e){e.UNKNOWN="Unknown",e.POLYGON="Polygon",e.POLYLINE="Polyline",e.TEXT="Text",e.PICTURE_MARKER="PictureMarker",e.PICTURE_FILL="PictureFill",e.COMPOSITE="Composite",e.MULTI="Multi"}(MarkupType||(MarkupType={}));export class MapCommands extends e{get addMarkup(){return this._messages.command("map.add-markup")}get addLayers(){return this._messages.command("map.add-layers")}get applyFilterEffect(){return this._messages.command("map.apply-filter-effect")}get applyLayerPreset(){return this._messages.command("map.apply-layer-preset")}get createNote(){return this._messages.command("map.create-note")}get editNote(){return this._messages.command("map.edit-note")}get removeFilterEffects(){return this._messages.command("map.remove-filter-effects")}get clearFilterEffects(){return this._messages.command("map.clear-filter-effects")}get clearMarkup(){return this._messages.command("map.clear-markup")}get disableMapClick(){return this._messages.command("map.disable-map-click")}get displayExtentSelector(){return this._messages.command("map.display-extent-selector")}get enableMapClick(){return this._messages.command("map.enable-map-click")}get goToFeatures(){return this._messages.command("map.go-to-features")}get goToGeometry(){return this._messages.command("map.go-to-geometry")}get goToViewpoint(){return this._messages.command("map.go-to-viewpoint")}get goToScale(){return this._messages.command("map.go-to-scale")}get goToInitialViewpoint(){return this._messages.command("map.go-to-initial-viewpoint")}get goToLayerExtent(){return this._messages.command("map.go-to-layer-extent")}get hideExtentSelector(){return this._messages.command("map.hide-extent-selector")}get hideMarkup(){return this._messages.command("map.hide-markup")}get panToFeatures(){return this._messages.command("map.pan-to-features")}get panToGeometry(){return this._messages.command("map.pan-to-geometry")}get pauseSketch(){return this._messages.command("map.pause-sketch")}get removeLayers(){return this._messages.command("map.remove-layers")}get replace(){return this._messages.command("map.replace")}get replaceAdditionalLayers(){return this._messages.command("map.replace-additional-layers")}get replaceMmpk(){return this._messages.command("map.replace-mmpk")}get resumeSketch(){return this._messages.command("map.resume-sketch")}get rotateBy(){return this._messages.command("map.rotate-by")}get rotateTo(){return this._messages.command("map.rotate-to")}get refresh(){return this._messages.command("map.refresh")}get setViewMode(){return this._messages.command("map.set-view-mode")}get showMarkup(){return this._messages.command("map.show-markup")}get updateLayer(){return this._messages.command("map.update-layer")}get zoomToFeatures(){return this._messages.command("map.zoom-to-features")}get zoomToGeometry(){return this._messages.command("map.zoom-to-geometry")}get zoomIn(){return this._messages.command("map.zoom-in")}get zoomOut(){return this._messages.command("map.zoom-out")}get zoomToScale(){return this._messages.command("map.zoom-to-scale")}get zoomToInitialViewpoint(){return this._messages.command("map.zoom-to-initial-viewpoint")}get zoomToViewpoint(){return this._messages.command("map.zoom-to-viewpoint")}get zoomToLayerExtent(){return this._messages.command("map.zoom-to-layer-extent")}get zoomToLayerVisibleScale(){return this._messages.command("map.zoom-to-layer-visible-scale")}}export class MapEvents extends t{get initialized(){return this._messages.event("map.initialized")}get initializing(){return this._messages.event("map.initializing")}get markupAdded(){return this._messages.event("map.markup-added")}get markupCleared(){return this._messages.event("map.markup-cleared")}get navigationCompleted(){return this._messages.event("map.navigation-completed")}get refreshed(){return this._messages.event("map.refreshed")}get refreshing(){return this._messages.event("map.refreshing")}get rotated(){return this._messages.event("map.rotated")}get rotating(){return this._messages.event("map.rotating")}get switched(){return this._messages.event("map.switched")}get viewModeChanged(){return this._messages.event("map.view-mode-changed")}get viewpointChanged(){return this._messages.event("map.viewpoint-changed")}get imageExported(){return this._messages.event("map.image-exported")}}export class MapOperations extends s{get getUserCoordinatesInput(){return this._messages.operation("map.get-user-coordinates-input")}get getCoordinateTransformation(){return this._messages.operation("map.get-coordinate-transformation")}get exportImage(){return this._messages.operation("map.export-image")}get exportWebMapOrScene(){return this._messages.operation("map.export-web-map-or-scene")}get getMarkup(){return this._messages.operation("map.get-markup")}get getExtent(){return this._messages.operation("map.get-extent")}get getGeometryFromSelector(){return this._messages.operation("map.get-geometry-from-selector")}get getInitialViewpoint(){return this._messages.operation("map.get-initial-viewpoint")}get getViewpoint(){return this._messages.operation("map.get-viewpoint")}get getSpatialReference(){return this._messages.operation("map.get-spatial-reference")}get getVisibleCenter(){return this._messages.operation("map.get-visible-center")}get hide(){return this._messages.operation("map.hide")}get show(){return this._messages.operation("map.show")}get startSketch(){return this._messages.operation("map.start-sketch")}get stopSketch(){return this._messages.operation("map.stop-sketch")}get getViewInsets(){return this._messages.operation("map.get-view-insets")}}

package/messaging/schema/common-action.schema.json

@@ -668,19 +668,57 @@
         },
         "AddMarkupArgs": {
             "additionalProperties": false,
-            "description": "Arguments for the \"map.add-markup\" operation. Only available in Mobile.",
+            "description": "Arguments for the \"map.add-markup\" command.",
             "properties": {
+                "collection": {
+                    "description": "The named collection of markup to operate on. If not specified the default markup collection will be used. Some markup collection names are used internally by Web: \"default\": The default markup layer. \"vgs-active-snapping-guides\": The active snap point when snapping. \"vgs-buffer\": Buffer graphics from OOTB buffer tools. \"vgs-context-marker\": Right click context marker on map. \"vgs-dirty-indicator\": Invalid geometry indicators used when editing. \"vgs-editing-control\": Edit frame and vertices while editing geometries. \"vgs-location-accuracy\": Location accuracy circle when geolocating. \"vgs-location-marker-*\": Location markers have this prefix followed by the marker id. \"vgs-map-notes\": Map Notes. \"vgs-measurement-labels\": Labels on measured graphics. \"vgs-other-snapping-guides\": Additional snapping point visualizations. \"vgs-self-snaps\": Used internally by snapping. \"vgs-sketching\": Temporary graphics used while drawing geometries. \"vgs-snapping-radius\": Snapping radius when snapping is active. \"vgs-transient-measurement-labels\": Measurement labels used while drawing.",
+                    "type": "string"
+                },
                 "graphics": {
-                    "description": "The graphics to add to the map.",
-                    "items": {
-                        "$ref": "#/definitions/esri.Graphic"
-                    },
-                    "type": "array"
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/CreateGraphicsResult"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.Graphic"
+                        },
+                        {
+                            "items": {
+                                "$ref": "#/definitions/esri.Graphic"
+                            },
+                            "type": "array"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.Feature.Feature"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.FeatureSet"
+                        },
+                        {
+                            "items": {
+                                "anyOf": [
+                                    {
+                                        "$ref": "#/definitions/esri.Graphic"
+                                    },
+                                    {
+                                        "$ref": "#/definitions/esri.rest-api.Feature.Feature"
+                                    }
+                                ]
+                            },
+                            "type": "array"
+                        }
+                    ],
+                    "description": "The markup to add to the map. `GraphicsLike` is only available in Web."
+                },
+                "level": {
+                    "$ref": "#/definitions/MarkupLevel",
+                    "description": "The level (z-order) to assign the markup to. If not specified uses the same level as default markup."
+                },
+                "maps": {
+                    "$ref": "MapsLike",
+                    "description": "Map(s) to use for the command/operation."
                 }
             },
-            "required": [
-                "graphics"
-            ],
             "type": "object"
         },
         "AddNodeOrder": {
@@ -880,6 +918,25 @@
             ],
             "type": "object"
         },
+        "ClearMarkupArgs": {
+            "additionalProperties": false,
+            "description": "Arguments for the \"map.clear-markup\" command.",
+            "properties": {
+                "collection": {
+                    "description": "The named collection of markup to operate on. If not specified the default markup collection will be used. Some markup collection names are used internally by Web: \"default\": The default markup layer. \"vgs-active-snapping-guides\": The active snap point when snapping. \"vgs-buffer\": Buffer graphics from OOTB buffer tools. \"vgs-context-marker\": Right click context marker on map. \"vgs-dirty-indicator\": Invalid geometry indicators used when editing. \"vgs-editing-control\": Edit frame and vertices while editing geometries. \"vgs-location-accuracy\": Location accuracy circle when geolocating. \"vgs-location-marker-*\": Location markers have this prefix followed by the marker id. \"vgs-map-notes\": Map Notes. \"vgs-measurement-labels\": Labels on measured graphics. \"vgs-other-snapping-guides\": Additional snapping point visualizations. \"vgs-self-snaps\": Used internally by snapping. \"vgs-sketching\": Temporary graphics used while drawing geometries. \"vgs-snapping-radius\": Snapping radius when snapping is active. \"vgs-transient-measurement-labels\": Measurement labels used while drawing.",
+                    "type": "string"
+                },
+                "graphics": {
+                    "$ref": "#/definitions/GraphicsLike",
+                    "description": "The markup to clear. If not specified will clear all markup in the selected collection."
+                },
+                "maps": {
+                    "$ref": "MapsLike",
+                    "description": "Map(s) to use for the command/operation."
+                }
+            },
+            "type": "object"
+        },
         "ConfirmOperationArgs": {
             "additionalProperties": false,
             "description": "Arguments for the 'ui.confirm' operation.",
@@ -905,14 +962,74 @@
         },
         "CreateGraphicsArgs": {
             "additionalProperties": false,
-            "description": "Arguments for the \"drawing.create-graphics\" operation. Only available in Mobile.",
+            "description": "Arguments for the \"drawing.create-graphics\" operation. `GeometryLike`, `FeaturesLike` and `SymbolLike` are only available in Web.",
             "properties": {
+                "features": {
+                    "$ref": "#/definitions/FeaturesLike",
+                    "description": "Features containing geometry to create graphics from. Web only."
+                },
                 "geometry": {
-                    "$ref": "#/definitions/esri.Geometry",
+                    "$ref": "#/definitions/GeometryLike",
                     "description": "The geometry that was captured."
                 },
+                "maps": {
+                    "$ref": "MapsLike",
+                    "description": "Map(s) to use for the command/operation."
+                },
                 "symbol": {
-                    "$ref": "#/definitions/esri.Symbol",
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/esri.Symbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.SimpleMarkerSymbol.SimpleMarkerSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.SimpleLineSymbol.SimpleLineSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.SimpleFillSymbol.SimpleFillSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.PictureMarkerSymbol.PictureMarkerSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.PictureFillSymbol.PictureFillSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.SimpleMarkerSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.PictureMarkerSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.SimpleLineSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.SimpleFillSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.PictureFillSymbol"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.PointSymbol3D"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.PointSymbol3D.PointSymbol3D"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.LineSymbol3D"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.LineSymbol3D.LineSymbol3D"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.PolygonSymbol3D"
+                        },
+                        {
+                            "$ref": "#/definitions/esri.rest-api.PolygonSymbol3D.PolygonSymbol3D"
+                        }
+                    ],
                     "description": "The symbol that should be used to create the graphic. If null, a default is provided."
                 }
             },
@@ -1951,6 +2068,18 @@
             ],
             "description": "One or map extensions."
         },
+        "MarkupLevel": {
+            "description": "Levels (z-orders) to which markup can be assigned, listed from high to low.",
+            "enum": [
+                "custom1",
+                "custom2",
+                "custom3",
+                "default",
+                "labels",
+                "ui"
+            ],
+            "type": "string"
+        },
         "Model": {
             "additionalProperties": false,
             "description": "A model belonging to a component.",
@@ -2035,6 +2164,9 @@
                 {
                     "$ref": "#/definitions/esri.rest-api.FeatureLayer.FeatureLayer"
                 },
+                {
+                    "$ref": "#/definitions/esri.rest-api.GeoJSONLayer.GeoJSONLayer"
+                },
                 {
                     "$ref": "#/definitions/esri.rest-api.GeoRSSLayer.GeoRSSLayer"
                 },
@@ -2971,7 +3103,7 @@
             "$ref": "#/definitions/SetBasemapArgs"
         },
         "drawing.create-graphics": {
-            "description": "Creates graphics. In Web, creates graphics out of GeometryLike args, with the current symbols that are set on the DrawManager. In Mobile, creates graphics from the given CreateGraphicsArgs or CreateGraphicsArgs[] (or some GeometryLike args). Any provided symbol parameter is used, otherwise a default symbol is used.",
+            "description": "Creates graphics. In Web, creates graphics out of GeometryLike or CreateGraphicsArgs, with the current symbols that are set on the DrawManager. In Mobile, creates graphics from the given CreateGraphicsArgs or CreateGraphicsArgs[] (or some GeometryLike args). Any provided symbol parameter is used, otherwise a default symbol is used.",
             "enum": [
                 "drawing.create-graphics"
             ]
@@ -5998,6 +6130,105 @@
             },
             "type": "object"
         },
+        "esri.rest-api.GeoJSONLayer.GeoJSONLayer": {
+            "additionalProperties": false,
+            "description": "The GeoJSON layer type references a GeoJSON or TXT file from a publicly-accessible web server. It then dynamically loads into the map at run time. The GeoJSON layer will maintain a reference to the GeoJSON resource. Web map spec:{@linkhttps://developers.arcgis.com/web-map-specification/objects/geoJsonLayer/}. Web scene spec:{@linkhttps://developers.arcgis.com/web-scene-specification/objects/geoJsonLayer/}.",
+            "properties": {
+                "blendMode": {
+                    "$ref": "#/definitions/esri.rest-api._LayerBase.BlendMode",
+                    "description": "Blend modes are used to blend layers together to create an interesting effect in a layer, or even to produce what seems like a new layer."
+                },
+                "disablePopup": {
+                    "description": "Indicates whether to allow a client to ignore popups defined by the service item.",
+                    "type": "boolean"
+                },
+                "effect": {
+                    "$ref": "#/definitions/esri.rest-api.Effect.Effect",
+                    "description": "Effect provides various filter functions to achieve different visual effects similar to how image filters (photo apps) work."
+                },
+                "id": {
+                    "description": "A unique identifying string for the layer.",
+                    "type": "string"
+                },
+                "layerDefinition": {
+                    "$ref": "#/definitions/esri.rest-api.LayerDefinition.LayerDefinition",
+                    "description": "A layerDefinition object defining the attribute schema and drawing information for the layer."
+                },
+                "layerType": {
+                    "description": "The type of layer.",
+                    "enum": [
+                        "GeoJSON"
+                    ],
+                    "type": "string"
+                },
+                "listMode": {
+                    "$ref": "esri.ListMode",
+                    "description": "Indicates how the layer should display in the table of contents. The known values are listed below. See{@linksupport /esri!ListMode}."
+                },
+                "maxScale": {
+                    "description": "A number representing the maximum scale at which the layer will be visible. The number is the scale's denominator; thus, a value of 2400 represents a scale of 1/2,400. A value of 0 indicates that the layer will be visible no matter how far you zoom in.",
+                    "type": "number"
+                },
+                "minScale": {
+                    "description": "A number representing the minimum scale at which the layer will be visible. The number is the scale's denominator; thus, a value of 2400 represents a scale of 1/2,400.",
+                    "type": "number"
+                },
+                "opacity": {
+                    "description": "The degree of transparency applied to the layer on the client side, where 0 is full transparency and 1 is no transparency.",
+                    "type": "number"
+                },
+                "popupInfo": {
+                    "$ref": "#/definitions/esri.rest-api.PopupInfo.PopupInfo",
+                    "description": "A PopupInfo object defining the content of pop-up windows when you click or query a feature."
+                },
+                "refreshInterval": {
+                    "description": "When the refresh interval is set on a layer, the client must refresh that layer only, not the entire web map. The default value is '0', meaning the no refresh. You can enable a refresh interval on the following types of layers: ArcGIS Server web service, hosted feature layer, hosted tile layer, OGC WMS, OGS WMTS, tile layer, GeoRSS, Living Atlas layers, basemaps (including Bing Maps basemaps), CSV from the web with latitude and longitude fields, and KML when added to ArcGIS Online through the My Content page. See{@linkhttps://doc.arcgis.com/en/arcgis-online/create-maps/set-refresh-interval.htm}.",
+                    "type": "number"
+                },
+                "screenSizePerspective": {
+                    "description": "Apply perspective scaling to screen-size symbols.",
+                    "type": "boolean"
+                },
+                "showLabels": {
+                    "description": "Indicates whether to display labels for this layer. If true, labels will appear as defined in the labelingInfo property.",
+                    "type": "boolean"
+                },
+                "showLegend": {
+                    "description": "Indicates whether to allow map authors the ability to control what layers should be shown in a client's legend.",
+                    "type": "boolean"
+                },
+                "title": {
+                    "description": "A user-friendly title for the layer that can be used in a table of contents. If this is not included, then a title is derived from the service.",
+                    "type": "string"
+                },
+                "type": {
+                    "description": "(Deprecated, use layerType instead.) If the layer is referenced through a URL, but is not an ArcGIS web service, then this parameter can be supplied to denote the layer type. See{@linkportal /OperationalLayer!LegacyOperationalLayerType}and{@linkportal /BaseMapLayer!LegacyBaseMapLayerType}.",
+                    "enum": [
+                        "BingMapsAerial",
+                        "BingMapsHybrid",
+                        "BingMapsRoad",
+                        "CSV",
+                        "KML",
+                        "OpenStreetMap",
+                        "WMS",
+                        "WebTiledLayer"
+                    ],
+                    "type": "string"
+                },
+                "url": {
+                    "description": "The URL to the GeoJSON file that backs the layer.",
+                    "type": "string"
+                },
+                "visibility": {
+                    "description": "Determines whether the layer is initially visible in the web map.",
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "layerType"
+            ],
+            "type": "object"
+        },
         "esri.rest-api.GeoRSSLayer.GeoRSSLayer": {
             "additionalProperties": false,
             "description": "GeoRSS feeds may contain any combination of points, lines, and polygons. Web clients use a GeoRSS to JSON request service. This service returns one to many feature collections with different geometry types. The returned JSON specifies the point, lines, and polygons symbols used to display the features in that layer. See{@linkhttps://developers.arcgis.com/web-map-specification/objects/geoRSSLayer/}.",
@@ -12331,7 +12562,7 @@
             "$ref": "#/definitions/Features"
         },
         "map.add-markup": {
-            "description": "Adds markup to the map(s). In Web, uses GraphicsLike args. In Mobile, uses AddMarkupArgs or some GraphicsLike args.",
+            "description": "Adds markup to the map(s).",
             "enum": [
                 "map.add-markup"
             ]
@@ -12377,16 +12608,7 @@
         "map.clear-markup:input": {
             "anyOf": [
                 {
-                    "$ref": "@vertigis.arcgis-extensions.mapping.MapExtension.MapExtension"
-                },
-                {
-                    "items": {
-                        "$ref": "@vertigis.arcgis-extensions.mapping.MapExtension.MapExtension"
-                    },
-                    "type": "array"
-                },
-                {
-                    "$ref": "#/definitions/HasMaps"
+                    "$ref": "#/definitions/ClearMarkupArgs"
                 },
                 {
                     "type": "null"