Fixing git history #822

mfeigl · 2024-01-18T09:41:22Z

Description

TL;DR main and v.next are identical in terms of their code; however, their histories differ and think there things to merge into each other: main...v.next and v.next...main. I fixed v.next but main is protected and need this PR to reconcile its history.

Here are the steps I performed:
$ git checkout main // checkout main
$ git merge v.next // merge v.next into main
$ git checkout v.next // checkout v.next
$ git merge main // merge main into v.next
$ git push origin HEAD // push to v.next - makes no changes as the two branches are identical, but reconciles the history
$ git checkout main // checkout main
$ git checkout -b mfeigl/main // main is protected, so I need a new branch (this one)
$ git push origin HEAD // push to this branch

As you can see, mfeigl/main...v.next and v.next...mfeigl/main are identical and there are no differences between the two branches.

I already pushed onto v.next now I just need to push this branch onto main, and then the two branches will have the same history.

Checklist:

Set target branch to main (current release) or v.next (next release)
Request a reviewer
Assign a reviewer
Tag reviewer in comment

* initial commit * working sample * refactoring * refactoring, comments * copyright statement in Launcher class * data download to settings.gradle * change expiration display to static date, CSS edits * update screenshot * expiration message to sentence case * fix settings.gradle. Again. * plement review suggestions * formatting * update README.metadata.json * comments

* show scale in label * load mmpk * add checkboxes with labels * activate checkboxes, change checkbox text color dynamically * update label color * fix checkboxes, comments * optimise imports, copyright comment * labels and screenshot * update screenshot * update runtime build, update README.md * mmpk to class member * formatting and comments * javadoc comments * restore show_callout files * move downloading of sample data to settings.gradle * fix package naming * move scale label to control panel, check mmpk contains maps * fix checkbox text colours * UI fixes and label colouring * data download in settings.gradle * update README.md * update screenshot for UI changes * fix settings.gradle * fix settings.gradle * formatting * README.metadata.json redirect url to blank string * update README.md

* download preplanned map sample * refactoring * add ref to update parameters * method/enum name for update option * method/enum name for update option * update runtime version, imports * inner class to private * add auth manager to handle OAuth challenge * mark portal as requires authentication * update README.md * add screenshot alt text * update README.md * update README.md * update README.md for scheduled updates workflow * update link to guide * update README.md * update use case * improve 'how it works' * add preview of area of interest * improve drawing area of interest * update use case wording, references in additional information * fix deleting temp files, add button 'return to web map' * add numbering to list view * zoom to area on select, refactoring * update listener adding/removing * refactoring * disable/enable showWebMapButton approprately * add README.metadata.json * fix function naming * add confirmation popup when deleting * refactoring, use commons library to delete * fix commons-io dependency * 'show web map' button width * reorder imports * improve viewpoint change, button updates * smaller UI * refactoring and comments * javadoc comments and formatting * remove stray q file * address review corrections * review changes and refactoring * refactoring * whitespace * web map -> online map * further information -> additional information * mmpk to class member * change button text * selecting view online map pans to selected area * formatting * update README.md * copyright statements * remove commented code * try to simplify a bit * simplify sample * don't hide graphics overlay on download * add snippet * update How to use the sample section * Update DownloadPreplannedMap.png * Slim up the use case * remove fxml comments * remove redirect from for new sample

* create folder structure, add readme, metadata.json * split to mvc and add fxml file * ui and button events * UI and sketch mode * add basic kml sketching * show and hide style window after sketch complete * UI toggling based on app state * refactoring * add applying style * add saving * add combobox item list cell * show preview in combobox * JavaDoc comments * comments and refactoring * UI improvements * copyright in list cell factory * Center labels in UI * update README.md * add screenshot * improve saving * tidy ui, wait for map to load to enable ui * formatting * formatting fxml * optmise imports * remove unused css classes * improve file saving * refactor sample and improve UI * refactoring and comments * simplify UI (#407) * simplify UI * reuse file chooser * update readme, metadata, and image * add comments * remove unused imports

* initial commit * fix launcher * add apache commons dependencies, fix runtime version * update runtime version * update gradle script * review changes * add README.metadata.json * remove gif * update screenshot * mmpk to class member * update README.metadata.json * add second check for updates after applying * refactor checking for update * title typo, widen UI * update runtime build * remove error message details, refactoring * remove unused imports * move downloading from build to settings.gradle * update README.metadata.json * remove unneeded sync direction code * remove unneeded imports * update runtime version * replace UI with alert * update screenshot and readme.md * fix alert typo * remove progress indicator, add javadocs * remove update checks and update automatically * update README.metadata.json * Revert "remove update checks and update automatically" This reverts commit b9ee5ec. * Revert "update README.metadata.json" This reverts commit 74e6859. * minor cleanup * Rewording

* remove rollback on fail * create new instance when reopen mmpk * update comments * clean up imports

* Specify samples-data directory in File constructors * remove sout * add missing parent directory * add missing parent dir * Revert "add missing parent dir" This reverts commit 29c5abe. * add missing parent dir * change canonicalPath to absolutePath

* remove unpack workflow * add System.getProperty(data.dir),

* add sample * add toggle box and use only overrides with effect * change initial viewpoint, rearrange code * update screenshot for new UI * update readme to reflect changes * update 'how to use' * simplify sample * var naming and comments * update screenshot, readme, comments * update README.md * update readme.md * changes from design review * review changes * remove extra comma * minor rewording * readme formatting * add data.dir property

* initial commit * fix comments * refactoring * comments * fix URI * remove unused CSS, add screenshot * implement review corrections * update screenshot for new UI * UI changes, simplify applying opacity * setGroundOverlayOpacity() comment wording * update scene comment for clarity * review corrections * Change fields to local variables * add data.dir param

* set up sample * Update DisplaySubtypeFeatureLayerSample.java * update readme * refactor for fxml * self review * address review comments and update UI * fix typo * update method name * enable UI once sublayer has loaded * minor rewording

* add base classes and load utility network * build UI * add creating parameters and building trace task * fix asset group and type selection * comments in asset group/type search * add sorting and selecting connected features to highlight * terminal selection dialog * formatting * comments, formatting, UI fixes * ui optimisation * fix dialog list view, add list cell * use GeometryEngine.nearestCoordinate(), javadocs, formatting * add loading utility element groups workaround * add comment to highlight workaround * refactoring, formatting, javadoc * comment spelling * restore gradle files * java-tize README * update README.md and README.metadata.json * formatting, javadoc, and comments * rename method enableButtonInteraction() * Update README.md * unchain methods for readability * remove workaround (sample only in Dev for now) * whitespace * make controls area smaller * comments on symbol creation * refactoring, wait for selection to finish to hide progress indicator * javadoc * update 'about the data' * update 'how to use' * update 'how to use' and remove reference to 'Element' in status label * unused import * formatting * remove unused imports * typos, wording, sorting of relevant apis * rename sample * use renderers for starting point and barriers * remove unneeded check for barriers list * clear previous trace results directly after trace click * remove try/catch from terminal select dialog * refactor fxml * use ChoiceDialog for terminal selection * use unique value renderer for lines * update sample for new design * optimise imports£ * use string converter for terminal selection * update comments * bind handleMapViewClicked in fxml * refactoring * comments and formatting * ui improvements * refactor fetching asset type code * refactoring * improve terminal selection dialog * copyrights and readme.metadata.json * formatting and comments * fix fractionAlongEdge label * fix fractionAlongEdge label * remove console output of fraction along edge * improve error messages, keep terminal dialog in same window * improve element creation/terminal selection * better input confirmation, better terminal selection * remove check for geometry type * update readme, runtime version, code comments * readme and comments grammar * round fraction along edge, smaller UI * update screenshot for thinner UI * add base classes and load utility network * build UI * add creating parameters and building trace task * fix asset group and type selection * comments in asset group/type search * add sorting and selecting connected features to highlight * terminal selection dialog * formatting * comments, formatting, UI fixes * ui optimisation * fix dialog list view, add list cell * use GeometryEngine.nearestCoordinate(), javadocs, formatting * add loading utility element groups workaround * add comment to highlight workaround * refactoring, formatting, javadoc * comment spelling * restore gradle files * java-tize README * update README.md and README.metadata.json * formatting, javadoc, and comments * rename method enableButtonInteraction() * Update README.md * unchain methods for readability * remove workaround (sample only in Dev for now) * whitespace * make controls area smaller * comments on symbol creation * refactoring, wait for selection to finish to hide progress indicator * javadoc * update 'about the data' * update 'how to use' * update 'how to use' and remove reference to 'Element' in status label * unused import * formatting * remove unused imports * typos, wording, sorting of relevant apis * rename sample * use renderers for starting point and barriers * remove unneeded check for barriers list * clear previous trace results directly after trace click * remove try/catch from terminal select dialog * refactor fxml * use ChoiceDialog for terminal selection * use unique value renderer for lines * update sample for new design * optimise imports£ * use string converter for terminal selection * update comments * bind handleMapViewClicked in fxml * refactoring * comments and formatting * ui improvements * refactor fetching asset type code * refactoring * improve terminal selection dialog * copyrights and readme.metadata.json * formatting and comments * fix fractionAlongEdge label * fix fractionAlongEdge label * remove console output of fraction along edge * improve error messages, keep terminal dialog in same window * improve element creation/terminal selection * better input confirmation, better terminal selection * remove check for geometry type * update readme, runtime version, code comments * readme and comments grammar * round fraction along edge, smaller UI * update screenshot for thinner UI

* use correct arcgis version (#424) * remove reference to toggling coordinates (#426) * 100.7.0 (#425) * update api version * change api version to 100.5.0 * change version to 100.5.0 * start updates for java 11 * update java 11 parts * add dependencies for all platforms * Delete module-info.java * Update README Update README to alert Java 11 users to potential exceptions which may occur when running the project. Providing a suggested workaround from the OpenJavaFX docs. * Update README.md * add an integrated mesh layer sample * update arcgis version * use javafx plugin * remove jar task config * update arcgis version * move stage show * add point cloud data to sample data downloads * view point cloud data offline sample * Update build.gradle * change camera viewpoint * remove unused imports * update image * update api version * edit about the data and additional info sections * fix comment * Removed errant full stop * Open Mobile Scene Package (#318) * Gradle script includes path to download mspk file (further work required here) and implementation of sample in Java * Create README.md * Create OpenMobileScenePackage.png * Update typo in README * Updated gradle to point to correct data on AGOL * Update to sample code following review * Updates to ReadMe following review * Additional update to read me to include isDirectReadSupported.get * Updated from markdown to HTML * Remove id tags from HTML * Map reference scale (#319) * Create MapReferenceScaleSample.java * Set up MVC structure for sample * Set up basic map with MVC structure * Added label which updates scale of map as it changes * Set up means to change the map view to the selected reference scale * Set up check boxes for map layers * Update MapReferenceScaleController.java * Update MapReferenceScaleController.java * Allow string in combobox, split to return double to feed into map reference scale * Link checkbox with map layer to set reference scale * Method descriptions and remove unused imports * Fix indents * Create MapReferenceScale.png * Create README.md * Convert markdown to HTML * Addressed comments from review. ComboBox now double, vBoxes will load after map has loaded * Add a method to handle setting the reference scale when interacting with the combobox and the scale sync button. * Code updates following review removed unneeded label, added if loaded statement, and refactored map reference scale. Also updated Readme to account for behavior change. * move checkbox logic in with instanceof check * Update MapReferenceScaleController.java * Corrected title for sample * Merge master into dev (#322) * Camera controller US english update (#320) * Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar * Updates to Tiled Layer to show support for .tkpx files (#321) * Updates to tiled layer, including .tpkx support * Update tile cache readme to include support .tpkx * Allow downloading of non zip sample data (#324) * Allow downloading of non zip sample data * point scene layer sample (#323) * point scene layer sample * Merge master into Dev (#329) * Camera controller US english update (#320) * Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar * Updates to Tiled Layer to show support for .tkpx files (#321) * Updates to tiled layer, including .tpkx support * Update tile cache readme to include support .tpkx * Update slider to show values from 1-5 rather than 0-5 (#328) * remove online elevation data source (#327) * remove online elevation data source * remove unneeded ArcGISScene object * View content beneath terrain surface (#325) * Initiating sample with Scene URL * add done loading listener for changes * portal item entry for data * Add readme and image * Update ViewContentBeneathTerrainSurfaceSample.java * update build and refactor float code * Update ViewContentBeneathTerrainSurfaceSample.java * Add layer view state changed listener * Update ViewContentBeneathTerrainSurface.png * Address comments following review * update comment for add done loading listener on to scene * Update README.md * remove unused imports * group layers sample (#331) group layers sample * update version, delete extra copy of samples data * Play kml tours (#332) * play a kml tour sample * Generate offline map with local basemap (#330) * added dialog box for choosing which basemap to use * Update GenerateOfflineMapWithLocalBasemap.java * Update GenerateOfflineMapWithLocalBasemap.java * Update build.gradle * refactoring and neatening up the code * Update GenerateOfflineMapWithLocalBasemap.java * Ensure that the file exists before prompting user to find local file * Move standard code into private methods to draw attention to new API functionality * Add image and README * Update GenerateOfflineMapWithLocalBasemap.java * Update build.gradle * code restructuring (#333) * code restructuring * comment edits * Update image and readme * update description of generateOfflineMapDialog class * convert fields to local variables * convert readme from md to html * Merging Master into Dev (#345) * Browse wfs layers (#336) browse wfs layers sample * Raster rendering rule (#343) * create class, bring in image service raster, display it * zoom to extent of raster service * add functionality to apply hard-coded raster rendering rule * build and populate renderingruleInfoListView * change rule ListView for DropDown * make raster rendering rule apply on selection in drop-down * refactor imageServiceUrl * refactor applying rendering rule into separate function * refactor populating drop down and building HashMaps into own functions * remove HashMap, find rule through list index@ * improve comments * private final String imageServiceUrl * Add screenshot and update ReadMe * fix screenshot link in README * new screenshot * use string directly as argument for ImageServiceRaster * README from MD to HTML * bring methods back into start * use ComboBox<RenderingRuleInfo> and string converter * add vbox, label to show rendering rule descr. * rearrange imports * remove imageServiceRaster.loadAsync(); * add newline to label, update screenshot * change indentation to 2 spaces * Update README.md - remove html IDs and img alt * add load status indicator * fix imports * make ArgGISMap local * remove ComboBox.setEditable(False); * syntax, adding stylesheet * variable for ImageServiceRaster uri, update readme * formatting terminology in 'how it works' * readme markdown formatting * remove unused imports * comment for auto select of first rule * default selection now shows description * variable naming, remove unused code, factoring, comments * revise readme * comments, uri variable instantiated at first use * improve readme use-case * readme formatting, typos * tag formatting, typos * Merge `master` into `dev` (#350) * Browse wfs layers (#336) browse wfs layers sample * Raster rendering rule (#343) * Get elevation at a point (#341) * GetElevationAtAPoint - update screenshot (#348) * Token authentication (#347) * Update build.gradle * Allows user to click a value on slider to change exaggeration (#351) (#353) * Allows user to click a value on slider to change exaggeration * remove value changed listener, move annotation to correct place, add space before bracket * merge master into dev for ClosestFacilityStatic (#358) * Allows user to click a value on slider to change exaggeration (#351) * Closest facility static (#346) * merge master into dev (#362) * Clean up readme (#356) * fix/spatial-operations-reset-button (#359) * Edit and sync features (#352) * merge master into dev (#368) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * merge master into dev - oAuth Sample patch (#369) * Tschie/split (#387) separate samples into individual gradle projects, convert readmes to markdown, add readme metadata files * fix naming * Routing around barriers (#354) * build class with scene * render street map and add controls panel * add ui elements * add stops with lables on mouse click * add toggle of checkboxes * create pin symbols, number the stops incrementally * solve route task and display it, display instructions * can add barriers to map, switch between adding stops and barriers * implement barriers in routing, implement reset button * set the mode to adding stops on sample start * clear routes / barriers on right click * clear previous route when calculating new route * rearrange code for readability * symbol colours, fix remove last barrier * improve deleting stops and barriers * ui improvements, comments * improve comments/code structure, pin design * split sample into MVC structure with fxml * edit ui and comments * arrange code, comments, ui improvements * add display of travel time and distance * ui tweaks, add screenshot * add how it works, add use case * move variables from class to function scope * variable naming * README to html * revise readme * revise readme * add code comments * tidy imports * show route length in miles * whitespace * improve return compositesymbol * improve string formatting in route info * remove TODO * route length shows in km * remove unneeded TODOs * comment formatting * comment wording * comment wording * var naming, refactoring * fix bad routing condition, remove unused imports * comments and refactoring * barrier/route symbols to instance variables * create route task at launch * improve route solving and UI * whitespace * functions -> in-line code * readme edits * variables to method scope * fxml formtting, commenting, ui improvements * fxml line breaks * change 2nd order lists to ul * add normalizing geometry code * fxml refactor * reset title pane, pin image to class var * improve route info fetch * route/stop lists -> linked lists * improve removing stops/barriers * refactor click handling * refactor click handling * improve deleting stops/barriers * refactor adding/deleting stops * fixes * comments * indentation * formatting sample file * update README.md, comments * determine route automatically * use renderer for route graphics * bug fixes, refactoring * formatting * README.md to MD * remove extra backtick * add gradle wrapper * set main class to launcher * update README.md * Find service areas for multiple facilities (#367) * create basic class with ui elements, symbols * load in feature table, layer, and zoom to extent * solve service area task and display * UI improvements * imports * add facilities to task through featuretable * formatting * refactoring, ui fixes * comments and formatting * rm comment * add readme and screenshot * readme and comment edits * rename, remove reset button * rename, reduce service area * update readme to mirror design * comments * remove unused SimpleFillSymbol * graphics changes * change basemap to grey canvas * refactoring and variable naming * refactoring * readme wording * comments * screenshot * 3/5min service areas, yellow/red color * comments, bigger facility symbols * remove unneeded code, comment improvements, loop indices * describe both cutoffs in readme * service area comment * readme to html * smaller service areas, new screenshot * update readme for new service areas * update README.md, sample title * implement review changes * update settings.gradle * update build.gradle * package and folder names * Sample title: Area -> Areas * add gradle wrapper * fix main class name * implement review changes * update README.md, comments * update screenshot * update screenshot * Fix comment in ColormapRendererSample.java (#391) * Patch/create and save map - default challenge handler (#388) * implement default challenge handler * Update CreateAndSaveMapController.java fix typo * Update README.md * update README.md, code formatting * remove ShowMessage() method * review changes, update README to standard format * code formatting * Read symbols from mobile style file (#357) * create basic sample class with stage and map * split into main class, controller, fxml * load and search stylx file * click adds symbol to map * add styles to preview * add style to combobox, build preview on select * auto-build symbol preview and add on click * add slider to control size * add color selection dropdown * preview symbols in combobox * color only affects first symbol layer * code formatting, change first color to yellow * fix symbol and graphic sizing bug * improve variables * comboboxes to listviews * UI improvements and comments * refactoring and comments * make preview not resize with slider * refactoring * add readme * allow empty symbol selection, resize preview, fix mouse clicks * fix size slider preview * add labels and reset button * ui improvements * formatting and comments * add red color option, add screenshot * fxml formatting * formatting * formatting * refactoring * comments and refactoring * fxml refactor * formatting * comments and refactoring * swap SymbolLayerInfo class for HashMap * comments * use SymbolStyleSearchResult directly to access symbols * comments and refactoring * implement slider functionality through fxml * formatting * improve use case * use case wording * improve updateSymbolSize() * Revert "improve updateSymbolSize()" This reverts commit 372e73c09825265a016adfb59400ca849d3043c0. * refactor mouse click into fxml * add default switch case * inner classes to bottom of the file * reorder for consistency * whitespace * listview array instead of list * refactoring * ui improvements * readme improvements * review corrections * commen * change colour options * slider reacts to click and to drag * implement review changes * update README.md * inner classes to private, override methods * Update README.md * add gradle wrapper * fix data download * implement review changes * review changes, implement color picker * code formatting * Update geopackage sample (#374) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * patch oAuth sample custom challengehandler (#366) * implement fix for javafx webengine * formatting * add fix for create and save map sample * markdown to html formatting * update read geopackage design * update readme code snippets * improve comments * remove unneeded comments * comment wording * implement review corrections * whitespace * remove unrelated files * implement review changes * remove css stylesheet * clean up some comments * add readme metadata file * Patch/oauth default challenge handler (#375) * oauth with default challenge handler * code formatting and comments * correct redirect uri * remove fxml, formatting * revert gradle-wrapper.jar * comments * readme updated for def challenge handler * implement review changes * rename class file to match docsgst * rename package * implement default challenge handler * restore build.gradle * Revert "restore build.gradle" This reverts commit 35c1df0c3df53e1748ee44db0cb388085fa066b6. * Revert "implement default challenge handler" This reverts commit bd984783687fa1e2653f366fe9a99ff74bed6055. * fix screenshot file name * revert package and class name * update README.md * revert sample name, update README.metadata.json * implement review changes * remove extra comma * Routing around barriers - add isStillSincePress to mouse events (#394) * add isStillSincePress to mouse events * remove error log from error dialog * oauth - README.metadata.json formatting (#395) * formatting * mmpk to class member (#398) * Patch/dictionary symbol style update constructor (#393) * update DictionarySymbolStyle constructor * update README.md and comments * update Item ID * update constructor in remaining samples * update README.md, README.metadata.json * optimise imports * update xml files to remove control points * get Mil2525d xml from AGOL where applicable * remove xml in resources * fix typo on mil2525d * Patch/geometry engine simplify - add isSimple check (#399) * add isSimple check * update Readme.md * update comments, update metadata.json * Integrated windows auth (#370) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * patch oAuth sample custom challengehandler (#366) * implement fix for javafx webengine * formatting * add fix for create and save map sample * markdown to html formatting * working sample * comments, formatting, UI improvements * UI, screenshot, readme * readme formatting * code formatting * ui improvements, screenshot * comments, formatting * readme tags * javadoc comments * ui improvements * ui improvements * refactoring * comments * address review suggestions * smaller UI * update screenshot * listview holds portal item ids * Update README.md, comments * update README.md * fix package and path names * delete irrelevant files * readme to MD * add README.metadata.json * updated README.metadata.json * remove public search, refactoring * whitespace * cell factory to class, fxml tidying * error handling, comments, refactoring * error handling * remove loading/portal info text * class member to local var * update Readme.md for UI changes and review suggestions * refactoring * fix typo * Move construction of portal query parameters to its own line * small UI improvements, update screenshot * update README.md for screenshot link (#403) * Integrated windows auth - update README.metadata.json (#402) * update RAEDME.metadata.json * update tags in README.metadata.json * move local data download logic to settings.gradle (#401) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * patch oAuth sample custom challengehandler (#366) * implement fix for javafx webengine * formatting * add fix for create and save map sample * markdown to html formatting * corrects WKID to 4326 (#389) * corrects WKID to 4326 * use SpatialReferences.getWgs84 * move local data download logic to settings.gradle * move data download logic to settings.gradle * fix data paths * fixing data download for mil2505 xml file for sample viewer v2504 (#404) * update DictionarySymbolStyle constructor * update README.md and comments * update Item ID * update constructor in remaining samples * update README.md, README.metadata.json * optimise imports * update xml files to remove control points * get Mil2525d xml from AGOL where applicable * remove xml in resources * move data download to settings.gradle, fix paths * fix typo * fix directory name * fix local data folder * put native libraries in .arcgis folder * Honor mmpk expiration (#397) * initial commit * working sample * refactoring * refactoring, comments * copyright statement in Launcher class * data download to settings.gradle * change expiration display to static date, CSS edits * update screenshot * expiration message to sentence case * fix settings.gradle. Again. * plement review suggestions * formatting * update README.metadata.json * comments * Set annotation sublayer visibility (#396) * show scale in label * load mmpk * add checkboxes with labels * activate checkboxes, change checkbox text color dynamically * update label color * fix checkboxes, comments * optimise imports, copyright comment * labels and screenshot * update screenshot * update runtime build, update README.md * mmpk to class member * formatting and comments * javadoc comments * restore show_callout files * move downloading of sample data to settings.gradle * fix package naming * move scale label to control panel, check mmpk contains maps * fix checkbox text colours * UI fixes and label colouring * data download in settings.gradle * update README.md * update screenshot for UI changes * fix settings.gradle * fix settings.gradle * formatting * README.metadata.json redirect url to blank string * update README.md * Tschie/preplanned map (#405) * download preplanned map sample * refactoring * add ref to update parameters * method/enum name for update option * method/enum name for update option * update runtime version, imports * inner class to private * add auth manager to handle OAuth challenge * mark portal as requires authentication * update README.md * add screenshot alt text * update README.md * update README.md * update README.md for scheduled updates workflow * update link to guide * update README.md * update use case * improve 'how it works' * add preview of area of interest * improve drawing area of interest * update use case wording, references in additional information * fix deleting temp files, add button 'return to web map' * add numbering to list view * zoom to area on select, refactoring * update listener adding/removing * refactoring * disable/enable showWebMapButton approprately * add README.metadata.json * fix function naming * add confirmation popup when deleting * refactoring, use commons library to delete * fix commons-io dependency * 'show web map' button width * reorder imports * improve viewpoint change, button updates * smaller UI * refactoring and comments * javadoc comments and formatting * remove stray q file * address review corrections * review changes and refactoring * refactoring * whitespace * web map -> online map * further information -> additional information * mmpk to class member * change button text * selecting view online map pans to selected area * formatting * update README.md * copyright statements * remove commented code * try to simplify a bit * simplify sample * don't hide graphics overlay on download * add snippet * update How to use the sample section * Update DownloadPreplannedMap.png * Slim up the use case * remove fxml comments * remove redirect from for new sample * ignore iml files * Create and save kml file (#406) * create folder structure, add readme, metadata.json * split to mvc and add fxml file * ui and button events * UI and sketch mode * add basic kml sketching * show and hide style window after sketch complete * UI toggling based on app state * refactoring * add applying style * add saving * add combobox item list cell * show preview in combobox * JavaDoc comments * comments and refactoring * UI improvements * copyright in list cell factory * Center labels in UI * update README.md * add screenshot * improve saving * tidy ui, wait for map to load to enable ui * formatting * formatting fxml * optmise imports * remove unused css classes * improve file saving * refactor sample and improve UI * refactoring and comments * simplify UI (#407) * simplify UI * reuse file chooser * update readme, metadata, and image * add comments * remove unused imports * Apply scheduled updates to preplanned map area (#392) * initial commit * fix launcher * add apache commons dependencies, fix runtime version * update runtime version * update gradle script * review changes * add README.metadata.json * remove gif * update screenshot * mmpk to class member * update README.metadata.json * add second check for updates after applying * refactor checking for update * title typo, widen UI * update runtime build * remove error message details, refactoring * remove unused imports * move downloading from build to settings.gradle * update README.metadata.json * remove unneeded sync direction code * remove unneeded imports * update runtime version * replace UI with alert * update screenshot and readme.md * fix alert typo * remove progress indicator, add javadocs * remove update checks and update automatically * update README.metadata.json * Revert "remove update checks and update automatically" This reverts commit b9ee5ec630a52d1fd986cd4c531b47a37d45e8b6. * Revert "update README.metadata.json" This reverts commit 74e6859785e0737b24833e7d98a24e8b8adbda8e. * minor cleanup * Rewording * Patch/apply scheduled updates (#412) * remove rollback on fail * create new instance when reopen mmpk * update comments * clean up imports * Data parent directory (#413) * Specify samples-data directory in File constructors * remove sout * add missing parent directory * add missing parent dir * Revert "add missing parent dir" This reverts commit 29c5abe24bce0f227a88225808558c3f5b593e89. * add missing parent dir * change canonicalPath to absolutePath * specify parent directory in File constructor * avoid explicit list of excluded directories * show progress indicator on initial load * Jon/remove unpack workflow2 (#422) * remove unpack workflow * add System.getProperty(data.dir), * Custom dictionary style [into dev] (#421) * add sample * add toggle box and use only overrides with effect * change initial viewpoint, rearrange code * update screenshot for new UI * update readme to reflect changes * update 'how to use' * simplify sample * var naming and comments * update screenshot, readme, comments * update README.md * update readme.md * changes from design review * review changes * remove extra comma * minor rewording * readme formatting * add data.dir property * Edit kml ground overlay [into dev] (#420) * initial commit * fix comments * refactoring * comments * fix URI * remove unused CSS, add screenshot * implement review corrections * update screenshot for new UI * UI changes, simplify applying opacity * setGroundOverlayOpacity() comment wording * update scene comment for clarity * review corrections * Change fields to local variables * add data.dir param * add panel-region class to vbox * update arcgis version to 100.7.0 * remove reference to toggling coordinates (#428) * Display subtype feature layer (#427) * set up sample * Update DisplaySubtypeFeatureLayerSample.java * update readme * refactor for fxml * self review * address review comments and update UI * fix typo * update method name * enable UI once sublayer has loaded * minor rewording * correct package * correct category case (#431) * Patch/iwa self signed (#430) * update api version * change api version to 100.5.0 * change version to 100.5.0 * start updates for java 11 * update java 11 parts * add dependencies for all platforms * Delete module-info.java * Update README Update README to alert Java 11 users to potential exceptions which may occur when running the project. Providing a suggested workaround from the OpenJavaFX docs. * Update README.md * add an integrated mesh layer sample * update arcgis version * use javafx plugin * remove jar task config * update arcgis version * move stage show * add point cloud data to sample data downloads * view point cloud data offline sample * Update build.gradle * change camera viewpoint * remove unused imports * update image * update api version * edit about the data and additional info sections * fix comment * Removed errant full stop * Open Mobile Scene Package (#318) * Gradle script includes path to download mspk file (further work required here) and implementation of sample in Java * Create README.md * Create OpenMobileScenePackage.png * Update typo in README * Updated gradle to point to correct data on AGOL * Update to sample code following review * Updates to ReadMe following review * Additional update to read me to include isDirectReadSupported.get * Updated from markdown to HTML * Remove id tags from HTML * Map reference scale (#319) * Create MapReferenceScaleSample.java * Set up MVC structure for sample * Set up basic map with MVC structure * Added label which updates scale of map as it changes * Set up means to change the map view to the selected reference scale * Set up check boxes for map layers * Update MapReferenceScaleController.java * Update MapReferenceScaleController.java * Allow string in combobox, split to return double to feed into map reference scale * Link checkbox with map layer to set reference scale * Method descriptions and remove unused imports * Fix indents * Create MapReferenceScale.png * Create README.md * Convert markdown to HTML * Addressed comments from review. ComboBox now double, vBoxes will load after map has loaded * Add a method to handle setting the reference scale when interacting with the combobox and the scale sync button. * Code updates following review removed unneeded label, added if loaded statement, and refactored map reference scale. Also updated Readme to account for behavior change. * move checkbox logic in with instanceof check * Update MapReferenceScaleController.java * Corrected title for sample * Merge master into dev (#322) * Camera controller US english update (#320) * Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar * Updates to Tiled Layer to show support for .tkpx files (#321) * Updates to tiled layer, including .tpkx support * Update tile cache readme to include support .tpkx * Allow downloading of non zip sample data (#324) * Allow downloading of non zip sample data * point scene layer sample (#323) * point scene layer sample * Merge master into Dev (#329) * Camera controller US english update (#320) * Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar * Updates to Tiled Layer to show support for .tkpx files (#321) * Updates to tiled layer, including .tpkx support * Update tile cache readme to include support .tpkx * Update slider to show values from 1-5 rather than 0-5 (#328) * remove online elevation data source (#327) * remove online elevation data source * remove unneeded ArcGISScene object * View content beneath terrain surface (#325) * Initiating sample with Scene URL * add done loading listener for changes * portal item entry for data * Add readme and image * Update ViewContentBeneathTerrainSurfaceSample.java * update build and refactor float code * Update ViewContentBeneathTerrainSurfaceSample.java * Add layer view state changed listener * Update ViewContentBeneathTerrainSurface.png * Address comments following review * update comment for add done loading listener on to scene * Update README.md * remove unused imports * group layers sample (#331) group layers sample * update version, delete extra copy of samples data * Play kml tours (#332) * play a kml tour sample * Generate offline map with local basemap (#330) * added dialog box for choosing which basemap to use * Update GenerateOfflineMapWithLocalBasemap.java * Update GenerateOfflineMapWithLocalBasemap.java * Update build.gradle * refactoring and neatening up the code * Update GenerateOfflineMapWithLocalBasemap.java * Ensure that the file exists before prompting user to find local file * Move standard code into private methods to draw attention to new API functionality * Add image and README * Update GenerateOfflineMapWithLocalBasemap.java * Update build.gradle * code restructuring (#333) * code restructuring * comment edits * Update image and readme * update description of generateOfflineMapDialog class * convert fields to local variables * convert readme from md to html * Merging Master into Dev (#345) * Browse wfs layers (#336) browse wfs layers sample * Raster rendering rule (#343) * create class, bring in image service raster, display it * zoom to extent of raster service * add functionality to apply hard-coded raster rendering rule * build and populate renderingruleInfoListView * change rule ListView for DropDown * make raster rendering rule apply on selection in drop-down * refactor imageServiceUrl * refactor applying rendering rule into separate function * refactor populating drop down and building HashMaps into own functions * remove HashMap, find rule through list index@ * improve comments * private final String imageServiceUrl * Add screenshot and update ReadMe * fix screenshot link in README * new screenshot * use string directly as argument for ImageServiceRaster * README from MD to HTML * bring methods back into start * use ComboBox<RenderingRuleInfo> and string converter * add vbox, label to show rendering rule descr. * rearrange imports * remove imageServiceRaster.loadAsync(); * add newline to label, update screenshot * change indentation to 2 spaces * Update README.md - remove html IDs and img alt * add load status indicator * fix imports * make ArgGISMap local * remove ComboBox.setEditable(False); * syntax, adding stylesheet * variable for ImageServiceRaster uri, update readme * formatting terminology in 'how it works' * readme markdown formatting * remove unused imports * comment for auto select of first rule * default selection now shows description * variable naming, remove unused code, factoring, comments * revise readme * comments, uri variable instantiated at first use * improve readme use-case * readme formatting, typos * tag formatting, typos * Merge `master` into `dev` (#350) * Browse wfs layers (#336) browse wfs layers sample * Raster rendering rule (#343) * Get elevation at a point (#341) * GetElevationAtAPoint - update screenshot (#348) * Token authentication (#347) * Update build.gradle * Allows user to click a value on slider to change exaggeration (#351) (#353) * Allows user to click a value on slider to change exaggeration * remove value changed listener, move annotation to correct place, add space before bracket * merge master into dev for ClosestFacilityStatic (#358) * Allows user to click a value on slider to change exaggeration (#351) * Closest facility static (#346) * merge master into dev (#362) * Clean up readme (#356) * fix/spatial-operations-reset-button (#359) * Edit and sync features (#352) * merge master into dev (#368) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * merge master into dev - oAuth Sample patch (#369) * Tschie/split (#387) separate samples into individual gradle projects, convert readmes to markdown, add readme metadata files * fix naming * Routing around barriers (#354) * build class with scene * render street map and add controls panel * add ui elements * add stops with lables on mouse click * add toggle of checkboxes * create pin symbols, number the stops incrementally * solve route task and display it, display instructions * can add barriers to map, switch between adding stops and barriers * implement barriers in routing, implement reset button * set the mode to adding stops on sample start * clear routes / barriers on right click * clear previous route when calculating new route * rearrange code for readability * symbol colours, fix remove last barrier * improve deleting stops and barriers * ui improvements, comments * improve comments/code structure, pin design * split sample into MVC structure with fxml * edit ui and comments * arrange code, comments, ui improvements * add display of travel time and distance * ui tweaks, add screenshot * add how it works, add use case * move variables from class to function scope * variable naming * README to html * revise readme * revise readme * add code comments * tidy imports * show route length in miles * whitespace * improve return compositesymbol * improve string formatting in route info * remove TODO * route length shows in km * remove unneeded TODOs * comment formatting * comment wording * comment wording * var naming, refactoring * fix bad routing condition, remove unused imports * comments and refactoring * barrier/route symbols to instance variables * create route task at launch * improve route solving and UI * whitespace * functions -> in-line code * readme edits * variables to method scope * fxml formtting, commenting, ui improvements * fxml line breaks * change 2nd order lists to ul * add normalizing geometry code * fxml refactor * reset title pane, pin image to class var * improve route info fetch * route/stop lists -> linked lists * improve removing stops/barriers * refactor click handling * refactor click handling * improve deleting stops/barriers * refactor adding/deleting stops * fixes * comments * indentation * formatting sample file * update README.md, comments * determine route automatically * use renderer for route graphics * bug fixes, refactoring * formatting * README.md to MD * remove extra backtick * add gradle wrapper * set main class to launcher * update README.md * Find service areas for multiple facilities (#367) * create basic class with ui elements, symbols * load in feature table, layer, and zoom to extent * solve service area task and display * UI improvements * imports * add facilities to task through featuretable * formatting * refactoring, ui fixes * comments and formatting * rm comment * add readme and screenshot * readme and comment edits * rename, remove reset button * rename, reduce service area * update readme to mirror design * comments * remove unused SimpleFillSymbol * graphics changes * change basemap to grey canvas * refactoring and variable naming * refactoring * readme wording * comments * screenshot * 3/5min service areas, yellow/red color * comments, bigger facility symbols * remove unneeded code, comment improvements, loop indices * describe both cutoffs in readme * service area comment * readme to html * smaller service areas, new screenshot * update readme for new service areas * update README.md, sample title * implement review changes * update settings.gradle * update build.gradle * package and folder names * Sample title: Area -> Areas * add gradle wrapper * fix main class name * implement review changes * update README.md, comments * update screenshot * update screenshot * Fix comment in ColormapRendererSample.java (#391) * Patch/create and save map - default challenge handler (#388) * implement default challenge handler * Update CreateAndSaveMapController.java fix typo * Update README.md * update README.md, code formatting * remove ShowMessage() method * review changes, update README to standard format * code formatting * Read symbols from mobile style file (#357) * create basic sample class with stage and map * split into main class, controller, fxml * load and search stylx file * click adds symbol to map * add styles to preview * add style to combobox, build preview on select * auto-build symbol preview and add on click * add slider to control size * add color selection dropdown * preview symbols in combobox * color only affects first symbol layer * code formatting, change first color to yellow * fix symbol and graphic sizing bug * improve variables * comboboxes to listviews * UI improvements and comments * refactoring and comments * make preview not resize with slider * refactoring * add readme * allow empty symbol selection, resize preview, fix mouse clicks * fix size slider preview * add labels and reset button * ui improvements * formatting and comments * add red color option, add screenshot * fxml formatting * formatting * formatting * refactoring * comments and refactoring * fxml refactor * formatting * comments and refactoring * swap SymbolLayerInfo class for HashMap * comments * use SymbolStyleSearchResult directly to access symbols * comments and refactoring * implement slider functionality through fxml * formatting * improve use case * use case wording * improve updateSymbolSize() * Revert "improve updateSymbolSize()" This reverts commit 372e73c09825265a016adfb59400ca849d3043c0. * refactor mouse click into fxml * add default switch case * inner classes to bottom of the file * reorder for consistency * whitespace * listview array instead of list * refactoring * ui improvements * readme improvements * review corrections * commen * change colour options * slider reacts to click and to drag * implement review changes * update README.md * inner classes to private, override methods * Update README.md * add gradle wrapper * fix data download * implement review changes * review changes, implement color picker * code formatting * Update geopackage sample (#374) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * patch oAuth sample custom challengehandler (#366) * implement fix for javafx webengine * formatting * add fix for create and save map sample * markdown to html formatting * update read geopackage design * update readme code snippets * improve comments * remove unneeded comments * comment wording * implement review corrections * whitespace * remove unrelated files * implement review changes * remove css stylesheet * clean up some comments * add readme metadata file * Patch/oauth default challenge handler (#375) * oauth with default challenge handler * code formatting and comments * correct redirect uri * remove fxml, formatting * revert gradle-wrapper.jar * comments * readme updated for def challenge handler * implement review changes * rename class file to match docsgst * rename package * implement default challenge handler * restore build.gradle * Revert "restore build.gradle" This reverts commit 35c1df0c3df53e1748ee44db0cb388085fa066b6. * Revert "implement default challenge handler" This reverts commit bd984783687fa1e2653f366fe9a99ff74bed6055. * fix screenshot file name * revert package and class name * update README.md * revert sample name, update README.metadata.json * implement review changes * remove extra comma * Routing around barriers - add isStillSincePress to mouse events (#394) * add isStillSincePress to mouse events * remove error log from error dialog * oauth - README.metadata.json formatting (#395) * formatting * mmpk to class member (#398) * Patch/dictionary symbol style update constructor (#393) * update DictionarySymbolStyle constructor * update README.md and comments * update Item ID * update constructor in remaining samples * update README.md, README.metadata.json * optimise imports * update xml files to remove control points * get Mil2525d xml from AGOL where applicable * remove xml in resources * fix typo on mil2525d * Patch/geometry engine simplify - add isSimple check (#399) * add isSimple check * update Readme.md * update comments, update metadata.json * Integrated windows auth (#370) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * patch oAuth sample custom challengehandler (#366) * implement fix for javafx webengine * formatting * add fix for create and save map sample * markdown to html formatting * working sample * comments, formatting, UI improvements * UI, screenshot, readme * readme formatting * code formatting * ui improvements, screenshot * comments, formatting * readme tags * javadoc comments * ui improvements * ui improvements * refactoring * comments * address review suggestions * smaller UI * update screenshot * listview holds portal item ids * Update README.md, comments * update README.md * fix package and path names * delete irrelevant files * readme to MD * add README.metadata.json * updated README.metadata.json * remove public search, refactoring * whitespace * cell factory to class, fxml tidying * error handling, comments, refactoring * error handling * remove loading/portal info text * class member to local var * update Readme.md for UI changes and review suggestions * refactoring * fix typo * Move construction of portal query parameters to its own line * small UI improvements, update screenshot * update README.md for screenshot link (#403) * Integrated windows auth - update README.metadata.json (#402) * update RAEDME.metadata.json * update tags in README.metadata.json * move local data download logic to settings.gradle (#401) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * patch oAuth sample custom challengehandler (#366) * implement fix for javafx webengine * formatting * add fix for create and save map sample * markdown to html formatting * corrects WKID to 4326 (#389) * corrects WKID to 4326 * use SpatialReferences.getWgs84 * move local data download logic to settings.gradle * move data download logic to settings.gradle * fix data paths * fixing data download for mil2505 xml file for sample viewer v2504 (#404) * update DictionarySymbolStyle constructor * update README.md and comments * update Item ID * update constructor in remaining samples * update README.md, README.metadata.json * optimise imports * update xml files to remove control points * get Mil2525d xml from AGOL where applicable * remove xml in resources * move data download to settings.gradle, fix paths * fix typo * fix directory name * fix local data folder * put native libraries in .arcgis folder * Honor mmpk expiration (#397) * initial commit * working sample * refactoring * refactoring, comments * copyright statement in Launcher class * data download to settings.gradle * change expiration display to static date, CSS edits * update screenshot * expiration message to sentence case * fix settings.gradle. Again. * plement review suggestions * formatting * update README.metadata.json * comments * Set annotation sublayer visibility (#396) * show scale in label * load mmpk * add checkboxes with labels * activate checkboxes, change checkbox text color dynamically * update label color * fix checkboxes, comments * optimise imports, copyright comment * labels and screenshot * update screenshot * update runtime build, update README.md * mmpk to class member * formatting and comments * javadoc comments * restore show_callout files * move downloading of sample data to settings.gradle * fix package naming * move scale label to control panel, check mmpk contains maps * fix checkbox text colours * UI fixes and label colouring * data download in settings.gradle * update README.md * update screenshot for UI changes * fix settings.gradle * fix settings.gradle * formatting * README.metadata.json redirect url to blank string * update README.md * Tschie/preplanned map (#405) * download preplanned map sample * refactoring * add ref to update parameters * method/enum name for update option * method/enum name for update option * update runtime version, imports * inner class to private * add auth manager to handle OAuth challenge * mark portal as requires authentication * update README.md * add screenshot alt text * update README.md * update README.md * update README.md for scheduled updates workflow * update link to guide * update README.md * update use case * improve 'how it works' * add preview of area of interest * improve drawing area of interest * update use case wording, references in additional information * fix deleting temp files, add button 'return to web map' * add numbering to list view * zoom to area on select, refactoring * update listener adding/removing * refactoring * disable/enable showWebMapButton approprately * add README.metadata.json * fix function naming * add confirmation popup when deleting * refactoring, use commons library to delete * fix commons-io dependency * 'show web map' button width * reorder imports * improve viewpoint change, button updates * smaller UI * refactoring and comments * javadoc comments and formatting * remove stray q file * address review corrections * review changes and refactoring * refactoring * whitespace * web map -> online map * further information -> additional information * mmpk to class member * change button text * selecting view online map pans to selected area * formatting * update README.md * copyright statements * remove commented code * try to simplify a bit * simplify sample * don't hide graphics overlay on download * add snippet * update How to use the sample section * Update DownloadPreplannedMap.png * Slim up the use case * remove fxml comments * remove redirect from for new sample * ignore iml files * Create and save kml file (#406) * create folder structure, add readme, metadata.json * split to mvc and add fxml file * ui and button events * UI and sketch mode * add basic kml sketching * show and hide style window after sketch complete * UI toggling based on app state * refactoring * add applying style * add saving * add combobox item list cell * show preview in combobox * JavaDoc comments * comments and refactoring * UI improvements * copyright in list cell factory * Center labels in UI * update README.md * add screenshot * improve saving * tidy ui, wait for map to load to enable ui * formatting * formatting fxml * optmise imports * remove unused css classes * improve file saving * refactor sample and improve UI * refactoring and comments * simplify UI (#407) * simplify UI * reuse file chooser * update readme, metadata, and image * add comments * remove unused imports * Apply scheduled updates to preplanned map area (#392) * initial commit * fix launcher * add apache commons dependencies, fix runtime version * update runtime version * update gradle script * review changes * add README.metadata.json * remove gif * update screenshot * mmpk to class member * update README.metadata.json * add second check for updates after applying * refactor checking for update * title typo, widen UI * update runtime build * remove error message details, refactoring * remove unused imports * move downloading from build to settings.gradle * update README.metadata.json * remove unneeded sync direction code * remove unneeded imports * update runtime version * replace UI with alert * update screenshot and readme.md * fix alert typo * remove progress indicator, add javadocs * remove update checks and update automatically * update README.metadata.json * Revert "remove update checks and update automatically" This reverts commit b9ee5ec630a52d1fd986cd4c531b47a37d45e8b6. * Revert "update README.metadata.json" This reverts commit 74e6859785e0737b24833e7d98a24e8b8adbda8e. * minor cleanup * Rewording * Patch/apply scheduled updates (#412) * remove rollback on fail * create new instance when reopen mmpk * update comments * clean up imports * Data parent directory (#413) * Specify samples-data directory in File constructors * remove sout * add missing parent directory * add missing parent dir * Revert "add missing parent dir" This reverts commit 29c5abe24bce0f227a88225808558c3f5b593e89. * add missing parent dir * change canonicalPath to absolutePath * specify parent directory in File constructor * avoid explicit list of excluded directories * show progress indicator on initial load * Jon/remove unpack workflow2 (#422) * remove unpack workflow * add System.getProperty(data.dir), * Custom dictionary style [into dev] (#421) * add sample * add toggle box and use only overrides with effect * change initial viewpoint, rearrange code * update screenshot for new UI * update readme to reflect changes * update 'how to use' * simplify sample * var naming and comments * update screenshot, readme, comments * update README.md * update readme.md * changes from design review * review changes * remove extra comma * minor rewording * readme formatting * add data.dir property * Edit kml ground overlay [into dev] (#420) * initial commit * fix comments * refactoring * comments * fix URI * remove unused CSS, add screenshot * implement review corrections * update screenshot for new UI * UI changes, simplify applying opacity * setGroundOverlayOpacity() comment wording * update scene comment for clarity * review corrections * Change fields to local variables * add data.dir param * add panel-region class to vbox * update arcgis version to 100.7.0 * remove reference to toggling coordinates (#428) * add support for self-signed challenges * comments * auto-add 'https://' prefix Co-authored-by: Tyler Schiewe <tyler.schiewe@gmail.com> Co-authored-by: Rachael Ellen <36415565+Rachael-E@users.noreply.github.com> Co-authored-by: Philip Ridgeway <philip.ridgeway@gmail.com> * Update sample design: surface placement draped (#429) * update api version * change api version to 100.5.0 * change version to 100.5.0 * start updates for java 11 * update java 11 parts * add dependencies for all platforms * Delete module-info.java * Update README Update README to alert Java 11 users to potential exceptions which may occur when running the project. Providing a suggested workaround from the OpenJavaFX docs. * Update README.md * add an integrated mesh layer sample * update arcgis version * use javafx plugin * remove jar task config * update arcgis version * move stage show * add point cloud data to sample data downloads * view point cloud data offline sample * Update build.gradle * change camera viewpoint * remove unused imports * update image * update api version * edit about the data and additional info sections * fix comment * Removed errant full stop * Open Mobile Scene Package (#318) * Gradle script includes path to download mspk file (further work required here) and implementation of sample in Java * Create README.md * Create OpenMobileScenePackage.png * Update typo in README * Updated gradle to point to correct data on AGOL * Update to sample code following review * Updates to ReadMe following review * Additional update to read me to include isDirectReadSupported.get * Updated from markdown to HTML * Remove id tags from HTML * Map reference scale (#319) * Create MapReferenceScaleSample.java * Set up MVC structure for sample * Set up basic map with MVC structure * Added label which updates scale of map as it changes * Set up means to change the map view to the selected reference scale * Set up check boxes for map layers * Update MapReferenceScaleController.java * Update MapReferenceScaleController.java * Allow string in combobox, split to return double to feed into map reference scale * Link checkbox with map layer to set reference scale * Method descriptions and remove unused imports * Fix indents * Create MapReferenceScale.png * Create README.md * Convert markdown to HTML * Addressed comments from review. ComboBox now double, vBoxes will load after map has loaded * Add a method to handle setting the reference scale when interacting with the combobox and the scale sync button. * Code updates following review removed unneeded label, added if loaded statement, and refactored map reference scale. Also updated Readme to account for behavior change. * move checkbox logic in with instanceof check * Update MapReferenceScaleController.java * Corrected title for sample * Merge master into dev (#322) * Camera controller US english update (#320) * Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar * Updates to Tiled Layer to show support for .tkpx files (#321) * Updates to tiled layer, including .tpkx support * Update tile cache readme to include support .tpkx * Allow downloading of non zip sample data (#324) * Allow downloading of non zip sample data * point scene layer sample (#323) * point scene layer sample * Merge master into Dev (#329) * Camera controller US english update (#320) * Replace "aeroplane" with "plane" in README and code * Update image to show corrected spelling * Fix grammar * Updates to Tiled Layer to show support for .tkpx files (#321) * Updates to tiled layer, including .tpkx support * Update tile cache readme to include support .tpkx * Update slider to show values from 1-5 rather than 0-5 (#328) * remove online elevation data source (#327) * remove online elevation data source * remove unneeded ArcGISScene object * View content beneath terrain surface (#325) * Initiating sample with Scene URL * add done loading listener for changes * portal item entry for data * Add readme and image * Update ViewContentBeneathTerrainSurfaceSample.java * update build and refactor float code * Update ViewContentBeneathTerrainSurfaceSample.java * Add layer view state changed listener * Update ViewContentBeneathTerrainSurface.png * Address comments following review * update comment for add done loading listener on to scene * Update README.md * remove unused imports * group layers sample (#331) group layers sample * update version, delete extra copy of samples data * Play kml tours (#332) * play a kml tour sample * Generate offline map with local basemap (#330) * added dialog box for choosing which basemap to use * Update GenerateOfflineMapWithLocalBasemap.java * Update GenerateOfflineMapWithLocalBasemap.java * Update build.gradle * refactoring and neatening up the code * Update GenerateOfflineMapWithLocalBasemap.java * Ensure that the file exists before prompting user to find local file * Move standard code into private methods to draw attention to new API functionality * Add image and README * Update GenerateOfflineMapWithLocalBasemap.java * Update build.gradle * code restructuring (#333) * code restructuring * comment edits * Update image and readme * update description of generateOfflineMapDialog class * convert fields to local variables * convert readme from md to html * Merging Master into Dev (#345) * Browse wfs layers (#336) browse wfs layers sample * Raster rendering rule (#343) * create class, bring in image service raster, display it * zoom to extent of raster service * add functionality to apply hard-coded raster rendering rule * build and populate renderingruleInfoListView * change rule ListView for DropDown * make raster rendering rule apply on selection in drop-down * refactor imageServiceUrl * refactor applying rendering rule into separate function * refactor populating drop down and building HashMaps into own functions * remove HashMap, find rule through list index@ * improve comments * private final String imageServiceUrl * Add screenshot and update ReadMe * fix screenshot link in README * new screenshot * use string directly as argument for ImageServiceRaster * README from MD to HTML * bring methods back into start * use ComboBox<RenderingRuleInfo> and string converter * add vbox, label to show rendering rule descr. * rearrange imports * remove imageServiceRaster.loadAsync(); * add newline to label, update screenshot * change indentation to 2 spaces * Update README.md - remove html IDs and img alt * add load status indicator * fix imports * make ArgGISMap local * remove ComboBox.setEditable(False); * syntax, adding stylesheet * variable for ImageServiceRaster uri, update readme * formatting terminology in 'how it works' * readme markdown formatting * remove unused imports * comment for auto select of first rule * default selection now shows description * variable naming, remove unused code, factoring, comments * revise readme * comments, uri variable instantiated at first use * improve readme use-case * readme formatting, typos * tag formatting, typos * Merge `master` into `dev` (#350) * Browse wfs layers (#336) browse wfs layers sample * Raster rendering rule (#343) * Get elevation at a point (#341) * GetElevationAtAPoint - update screenshot (#348) * Token authentication (#347) * Update build.gradle * Allows user to click a value on slider to change exaggeration (#351) (#353) * Allows user to click a value on slider to change exaggeration * remove value changed listener, move annotation to correct place, add space before bracket * merge master into dev for ClosestFacilityStatic (#358) * Allows user to click a value on slider to change exaggeration (#351) * Closest facility static (#346) * merge master into dev (#362) * Clean up readme (#356) * fix/spatial-operations-reset-button (#359) * Edit and sync features (#352) * merge master into dev (#368) * patch-closest-facility-static-readme (#363) * delete sample calculate distance 3D (#365) * Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364) * merge master into dev - oAuth Sample patch (#369) * Tschie/split (#387) separate samples into individual gradle projects, convert readmes to markdown, add readme metadata files * fix naming * Routing around barriers (#354) * build class with scene * render street map and add controls panel * add ui elements * add stops with lables on mouse click * add toggle of checkboxes * create pin symbols, number the stops incrementally * solve route task and display it, display instructions * can add barriers to map, switch between adding stops and barriers * implement barriers in routing, implement reset button * set the mode to adding stops on sample start * clear routes / barriers on right click * clear previous route when calculating new route * rearrange code for readability * symbol colours, fix remove last barrier * improve deleting stops and barriers * ui improvements, comments * improve comments/code structure, pin design * …

* Update readmes to match common design (analysis category) (#444) * update analyse hotspots * update distance measurement analysis * update line of sight geoelement * update line of sight location * update viewshed camera * update viewshed geoelement * update viewshed geoprocessing * update viewshed location * casing of sample names / readme headers * tap -> click * implement review changes * Apply suggestions from code review Co-Authored-By: Rachael Ellen <36415565+Rachael-E@users.noreply.github.com> Co-authored-by: Rachael Ellen <36415565+Rachael-E@users.noreply.github.com> * Display annotation (#442) * add sample * update metadata * better sreenshot * restore unrelated file * review comments * Update display_information/display-annotation/src/main/java/com/esri/samples/display_annotation/DisplayAnnotationSample.java Co-Authored-By: Tyler Schiewe <tyler.schiewe@gmail.com> Co-authored-by: Tyler Schiewe <tyler.schiewe@gmail.com> * Display annotation - fix readme (#446) * add sample * update metadata * better sreenshot * restore unrelated file * review comments * Map -> ArcGISMap * Update readmes to match common design (Editing category) (#450) * update readmes to match common design * update with review comments * Update README.md Co-authored-by: Rachael Ellen <36415565+Rachael-E@users.noreply.github.com> Co-authored-by: Tyler Schiewe <tyler.schiewe@gmail.com>

* new sample - feature collection layer sample * Update build.gradle changes in build.gradle file * Update settings.gradle * changes in files for sample * changes in files * screenshot added and changes in java files * Update README.md * Update feature_layers/feature-collection-layer-from-portal/README.md Co-Authored-By: Jonathan Lavi <jonathan.lavi@gmail.com> * Update feature_layers/feature-collection-layer-from-portal/README.md Co-Authored-By: Jonathan Lavi <jonathan.lavi@gmail.com> * Apply suggestions from code review Co-Authored-By: Jonathan Lavi <jonathan.lavi@gmail.com> * sample changes removed controller file , added code into one java file and also removed fxml/css file * Apply suggestions from code review making changes as per review by jonathan Co-Authored-By: Jonathan Lavi <jonathan.lavi@gmail.com> * changes in 2 files made changes as per suggestion in pr * made changes in sample few more changes as per review by jonathan - removed javadoc comment - set text in costructor - import order / map portal oder fixes - validation of portalitem and loading status before creating FC * minor changes - typo in button name - remove extra sapce for else cond - added space in listener method * done changes tyler suggested - alert message - readme Co-authored-by: Jonathan Lavi <jonathan.lavi@gmail.com>

Update v.next with all modularisation changes

Updates dependencies and readme * update javafx version and plugin version * update gradle version * update slf4j and add to module info files * update root gradle version * upgrade or remove dependencies * Update WorkingWithGit.md * Update readme * Update build.gradle * Update sample-viewer.png * try not getting data for mspk * re-enable mspk * Remove secondary directory for san diego data * try file changes * revert to sandiego * Update module-info.java * code review changes

* Update builds.gradle to daily build * Mobile Map Search and Route Sample with CompletableFuture * Edit Feature Attachments Sample with CompletableFuture * WIP Read Symbols From Mobile Style File Sample with CompletableFuture * All compose samples to regular compose * Fix indents in compose samples * Symbol Dictionary Sample with CompletableFuture * fixup! Symbol Dictionary Sample with CompletableFuture * Perform Valve Isolation Trace Sample with CompletableFuture * Generate Offline Map Overrides Sample with CompletableFuture * fixup! Perform Valve Isolation Trace Sample with CompletableFuture * Minor fixes to MobileMapSearchAndRouteSample * Only update relevant gradle build files * Changes made after review * Changes made after review * Add comments in EditFeatureAttachmentsSample * Add comments to appyEdits method in EditFeatureAttachmentsSample * Typo correction in GenerateOfflineMapOverridesController * Use isEmpty * Undo changes to ReadSymbolsFromMobileStyleFileController until issue w/ symbol resolved * Changes to PerformValveIsolationTraceController after review * Revised CompletableFuture in PerformValveIsolationTraceController * Changes made after review: - add comment to EditFeatureAttachmentsSample - revert the rest of read-symbols-from-mobile-style-file --------- Co-authored-by: Jen Merritt <jmerritt@esri.com>

…ks (#794) * ManageBookmarksSample: bind the ListView to the map's list of Bookmarks * ManageBookmarksSample: update arcgisVersion to 200.2.0-3924 * ManageBookmarksSample: fix small typo in README.md * ManageBookmarksSample: change argument names in listener * ManageBookmarksSample: remove redundant brackets

…te Checkboxes (#796) * MapImageLayerSublayerVisibilitySample: use a ListView instead of 3 discrete Checkboxes * MapImageLayerSublayerVisibilitySample: update arcgisVersion to 200.2.0-3924 * MapImageLayerSublayerVisibilitySample: update screen shot * MapImageLayerSublayerVisibilitySample: reduce size of screen shot * MapImageLayerSublayerVisibilitySample: add inner class ArcGISSublayerStringConverter * MapImageLayerSublayerVisibilitySample: change size of screenshot file

* Created Sample -DisplayRouteLayer * Updated Code as per review comments * Changes made as per review comments * Updated as per review comments * Whitespace, indentation, and doc fixes --------- Co-authored-by: Oliver Smith <01smito01@gmail.com>

Updates the CreateAndEditGeometries sample with the new functionality for the upcoming release. Includes rotation/scaling of existing geometries, as well as use of the ShapeTool to create polylines/polygons of various shapes

* Switching AntBuilder to remove deprecation warnings * Removing zip dist task * Removing zip dist task * Removing zip dist task - a few which escaped the chop!

mfeigl · 2024-01-18T09:41:43Z

@D-R-Smith could you please review this PR?

D-R-Smith

@mfeigl looks okay to me

mfeigl · 2024-01-18T10:05:51Z

@jenmerritt could you please have a look at this PR? This is a follow up on the previous one which made sure the codes are identical between the two branches and then this one makes sure their histories are identical as well.

jenmerritt

Go for it

tschie and others added 30 commits August 12, 2019 10:17

fix local data folder

0a4cca8

put native libraries in .arcgis folder

c1c2b6d

Merge branch 'master' into dev

cd1a4cc

ignore iml files

9ed26f4

Patch/apply scheduled updates (#412)

009b2f3

* remove rollback on fail * create new instance when reopen mmpk * update comments * clean up imports

Data parent directory (#413)

95f1ee9

* Specify samples-data directory in File constructors * remove sout * add missing parent directory * add missing parent dir * Revert "add missing parent dir" This reverts commit 29c5abe. * add missing parent dir * change canonicalPath to absolutePath

specify parent directory in File constructor

f34287c

avoid explicit list of excluded directories

2ef5f63

Merge branch 'master' into dev

6d0ef08

show progress indicator on initial load

01a9bf8

Jon/remove unpack workflow2 (#422)

bdb6833

* remove unpack workflow * add System.getProperty(data.dir),

Merge branch 'master' into dev

afdb75a

add panel-region class to vbox

d521670

Display subtype feature layer (#427)

e06c5fa

* set up sample * Update DisplaySubtypeFeatureLayerSample.java * update readme * refactor for fxml * self review * address review comments and update UI * fix typo * update method name * enable UI once sublayer has loaded * minor rewording

display subtype feature layer - remove duplicate folder [dev] (#436)

60b2aae

Merge branch 'master' into dev

9d3158f

Merge branch 'master' into dev

050dadb

Merge branch 'master' into dev

412037a

Merge branch 'master' into dev

2a85c90

jenmerritt and others added 18 commits June 28, 2023 17:43

Merge branch 'v.next' into v200.develop

d242167

Merge pull request #792 from Esri/v200.develop

5d1bdff

Update v.next with all modularisation changes

Sample Update: Add Dynamic Entity Layer (#798)

64b040e

Add sample for custom dynamic entity data source (#799)

2f34857

Amend resource location (#801)

542dc05

Merge branch 'main' into v.next

dd82e8d

Replacing deprecated sketch editor with new geometry editor (#804)

9743da4

JavaFX plugin update to remove Gradle 9 warnings (#807)

2184ff3

Mark/8454 ant zip (#810)

83e04a6

* Switching AntBuilder to remove deprecation warnings * Removing zip dist task * Removing zip dist task * Removing zip dist task - a few which escaped the chop!

update v.next to be same as main (#819)

8a9bcd1

Fixing formatting error flagged up by git hook (#821)

b7e8e70

Merge branch 'v.next' into main

5de9824

mfeigl requested a review from D-R-Smith January 18, 2024 09:41

mfeigl assigned mfeigl and D-R-Smith Jan 18, 2024

D-R-Smith approved these changes Jan 18, 2024

View reviewed changes

D-R-Smith removed their assignment Jan 18, 2024

mfeigl requested a review from jenmerritt January 18, 2024 10:04

mfeigl assigned jenmerritt Jan 18, 2024

jenmerritt approved these changes Jan 18, 2024

View reviewed changes

jenmerritt removed their assignment Jan 18, 2024

mfeigl merged commit f9e8404 into main Jan 18, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixing git history #822

Fixing git history #822

mfeigl commented Jan 18, 2024

mfeigl commented Jan 18, 2024

D-R-Smith left a comment

mfeigl commented Jan 18, 2024

jenmerritt left a comment

Fixing git history #822

Fixing git history #822

Conversation

mfeigl commented Jan 18, 2024

Description

mfeigl commented Jan 18, 2024

D-R-Smith left a comment

Choose a reason for hiding this comment

mfeigl commented Jan 18, 2024

jenmerritt left a comment

Choose a reason for hiding this comment