Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

New: Configure subnetwork trace #897

Merged
merged 130 commits into from
Sep 14, 2020
Merged
Show file tree
Hide file tree
Changes from 129 commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
2efebf8
Created sample folder and added to sample viewer
vquach2404 May 20, 2020
64f6f5c
Added toolbar and new scenes
vquach2404 May 27, 2020
9398655
Added settings swift file and labels
vquach2404 May 28, 2020
5989c73
Added variables and renamed file
vquach2404 May 29, 2020
51ff504
Added action responses
vquach2404 Jun 2, 2020
bba4d09
Added compare function
vquach2404 Jun 4, 2020
2b9955c
Set initial popup to edit configurations
vquach2404 Jun 5, 2020
f6bf9fb
Merge commit '457fba700c0c53ab20f8afc7d68c197eac205eea' into Viv/conf…
vquach2404 Jun 5, 2020
76efe3e
Updated UI and interactive cells
vquach2404 Jun 5, 2020
f18c551
Added alert with textfield
vquach2404 Jun 6, 2020
f495a61
Removed extras
vquach2404 Jun 11, 2020
ea77f4b
String converts to correct number values
vquach2404 Jun 11, 2020
76481c6
Cleaned and commented code
vquach2404 Jun 11, 2020
64475d3
Added invalid input and selected attribute check
vquach2404 Jun 11, 2020
23a015b
Updated README and image
vquach2404 Jun 12, 2020
db126eb
Updated metadata.json
vquach2404 Jun 12, 2020
155ac32
Merge commit '5c73f30309602c62a5a5e9eb7fe4026e9084b912' into Viv/conf…
vquach2404 Jun 12, 2020
cde657e
Revert "Updated metadata.json"
vquach2404 Jun 12, 2020
fae0de1
Added metadata.json
vquach2404 Jun 12, 2020
d8da461
Reversed project.pbxproj
vquach2404 Jun 12, 2020
e427cc8
Reindented swift file
vquach2404 Jun 12, 2020
1f781a0
Reverted project file to include Feature collection layer
vquach2404 Jun 12, 2020
490f27d
Fixed project file
vquach2404 Jun 12, 2020
1985822
Update project.pbxproj
vquach2404 Jun 12, 2020
6f72410
Reversed Create and save KML file
vquach2404 Jun 12, 2020
e68e6af
Delted project.pbxproj.orig file
vquach2404 Jun 12, 2020
9121776
Updated keywords in metadata
vquach2404 Jun 17, 2020
d9ac1ae
Removed print statement
vquach2404 Jun 17, 2020
312d3f6
Removed return redundancy
vquach2404 Jun 17, 2020
31ac477
Fixed spelling typo
vquach2404 Jun 17, 2020
c457f6e
Removed extra "the"
vquach2404 Jun 24, 2020
3bd5f48
Removed extra space
vquach2404 Jun 24, 2020
cb43b97
Removed selectedValueString property
vquach2404 Jun 24, 2020
d92ea8e
Made global variables local
vquach2404 Jun 25, 2020
f92c9f1
Disabled value selection
vquach2404 Jun 25, 2020
30c9ee8
Removed disclosure indicator and disabled custom value button
vquach2404 Jun 26, 2020
b07836c
Added UITextFieldDelegate extension
vquach2404 Jun 26, 2020
4ce9ee5
Moved delegate
vquach2404 Jun 26, 2020
93fdc60
Switched over expression and no trace results found
vquach2404 Jun 26, 2020
7f39068
Reset selected value when attribute changed
vquach2404 Jun 27, 2020
9879ce9
Used multiline string literals
vquach2404 Jun 27, 2020
ca8fbd0
Got rid of isEqual function
vquach2404 Jun 27, 2020
7d4d7e1
Got rid of unneeded code
vquach2404 Jun 27, 2020
c4a03c0
Changed to dynamic table view
vquach2404 Jul 6, 2020
bf4c49f
Added delegate and datasource
vquach2404 Jul 7, 2020
08db118
Successful initial table load
vquach2404 Jul 10, 2020
8de6bc3
Adjusting cell
vquach2404 Jul 17, 2020
6d1edc8
Created a nib for label and condition cell
vquach2404 Jul 21, 2020
44ef29b
Adjusted reset function
vquach2404 Jul 21, 2020
b6e1847
Add condition cell expanded
vquach2404 Jul 22, 2020
b616ea3
Removed assign cells function
vquach2404 Jul 23, 2020
182f986
Storyboard edits
vquach2404 Jul 23, 2020
1cde6c2
Fixed UI issues and deleted extra storyboard
vquach2404 Aug 7, 2020
7969e8b
Added warnings and cleaned up comments
vquach2404 Aug 7, 2020
b039b99
Remove custom cell design.
yo1995 Aug 13, 2020
8f3983a
Remove custom cell design.
yo1995 Aug 13, 2020
007849f
Add new option VC.
yo1995 Aug 14, 2020
99083a6
Update project file.
yo1995 Aug 15, 2020
f7dfda5
Update storyboard design.
yo1995 Aug 15, 2020
da236e3
Refactor the sample.
yo1995 Aug 15, 2020
1218fe3
Add source file to copy file.
yo1995 Aug 15, 2020
965febc
Update type comparison.
yo1995 Aug 19, 2020
32ae3e5
Remove deinit flags.
yo1995 Aug 19, 2020
603f0eb
Change the conditons.
yo1995 Aug 19, 2020
1462dc9
Update observer reference.
yo1995 Aug 19, 2020
e7a1f48
Remove extra period in comment.
yo1995 Aug 19, 2020
b6cd9b3
Fix observer removal.
yo1995 Aug 21, 2020
7458fc7
Fix linter issue and update UI.
yo1995 Aug 21, 2020
ad09678
Gray out the chained expressions and disable selection.
yo1995 Aug 21, 2020
208ce7a
Rearranged buttons
vquach2404 Aug 21, 2020
b0a81f4
Centered chained conditions text
vquach2404 Aug 21, 2020
62cb275
Updated value cell and trace status
vquach2404 Aug 21, 2020
13862f6
Assigned textfield delegate
vquach2404 Aug 21, 2020
61088e0
Reorganized text field section
vquach2404 Aug 22, 2020
ed71514
Reorganized updateCellStates
vquach2404 Aug 22, 2020
4956846
Added comments and simplified value cell logic
vquach2404 Aug 24, 2020
acdae52
Solve merge conflicts.
yo1995 Aug 24, 2020
41c0b5d
Fix file reference in project file.
yo1995 Aug 24, 2020
02ee2ec
Fix folder reference.
yo1995 Aug 24, 2020
90dde3f
Remove redundant filename.
yo1995 Aug 24, 2020
c6e8706
Merge pull request #936 from Esri/Ting/New-configureSubnetworkTrace-v…
yo1995 Aug 24, 2020
54eba78
Updated screenshot
vquach2404 Aug 25, 2020
8051b56
Updated readme
vquach2404 Aug 25, 2020
f5da257
Update arcgis-ios-sdk-samples/Utility Network/Configure subnetwork tr…
vquach2404 Aug 25, 2020
ac1f34a
Update arcgis-ios-sdk-samples/Utility Network/Configure subnetwork tr…
vquach2404 Aug 25, 2020
16f342b
Updated metadata
vquach2404 Aug 25, 2020
54f0711
Updated readme
vquach2404 Aug 25, 2020
cdc6a90
Merge branch 'v.next' into Viv/configureSubnetwork_vNext
vquach2404 Aug 25, 2020
c8d2782
Removed redundancy
vquach2404 Aug 25, 2020
e3df609
Updated metadata
vquach2404 Aug 25, 2020
9c43d74
Update arcgis-ios-sdk-samples/Utility Network/Configure subnetwork tr…
vquach2404 Aug 25, 2020
27a32f9
Revert changes to submodule branch.
yo1995 Aug 26, 2020
2cb9840
Added comma
vquach2404 Sep 1, 2020
c900334
Unwrap configuration
vquach2404 Sep 1, 2020
5f1a423
Unwrapped assetType
vquach2404 Sep 1, 2020
8327989
Change return statment
vquach2404 Sep 1, 2020
9483278
Capitalized title
vquach2404 Sep 1, 2020
78c0d79
Changed Add to Done and removed Condition title
vquach2404 Sep 1, 2020
23bd8c4
Update arcgis-ios-sdk-samples/Utility Network/Configure subnetwork tr…
vquach2404 Sep 1, 2020
96b8050
Updated utiliityTierConfiguration
vquach2404 Sep 1, 2020
eb59d43
Update arcgis-ios-sdk-samples/Utility Network/Configure subnetwork tr…
vquach2404 Sep 1, 2020
1326f17
Update arcgis-ios-sdk-samples/Utility Network/Configure subnetwork tr…
vquach2404 Sep 1, 2020
3782f67
Fixed number formatter issue
vquach2404 Sep 1, 2020
e4a4b0c
Renamed Add BBI and updated cell states function
vquach2404 Sep 1, 2020
11ed7d2
Got rid of keyvaluepairs
vquach2404 Sep 2, 2020
219125f
Implemented canEditRowAt
vquach2404 Sep 2, 2020
9115f28
Changed table view grouping style and made cells unselectable
vquach2404 Sep 2, 2020
0f76df1
Renamed onDismiss function
vquach2404 Sep 2, 2020
883dff4
Moved chained conditions to footer
vquach2404 Sep 2, 2020
dea716e
Merge branch 'v.next'
yo1995 Sep 3, 2020
4dc6bd6
Fix inconsistency in description and metadata.
yo1995 Sep 3, 2020
2e83c5b
Reset colors in table view to default.
yo1995 Sep 3, 2020
2be671d
Update footer chained condition design.
yo1995 Sep 3, 2020
f73c5c1
Update screenshot.
yo1995 Sep 3, 2020
862b13f
Fix misc issues.
yo1995 Sep 3, 2020
80de928
Remove textfield delegate.
yo1995 Sep 3, 2020
d4957f5
Removed isEmpty
vquach2404 Sep 3, 2020
f42983c
Added self guard
vquach2404 Sep 3, 2020
2c8bdf3
Make changes to enum to mitigate https://bugs.swift.org/browse/SR-1419.
yo1995 Sep 4, 2020
0c0b480
Make the enum extension shorter.
yo1995 Sep 4, 2020
fd23552
Make enum private in main VC.
yo1995 Sep 4, 2020
1311aed
Add another private enum extension.
yo1995 Sep 4, 2020
820a1f9
Changed all -1 to nil
vquach2404 Sep 9, 2020
b56fef1
Merge remote-tracking branch 'origin/v.next' into Viv/configureSubnet…
vquach2404 Sep 9, 2020
25445f3
Updated selectedIndex for values
vquach2404 Sep 9, 2020
e783a94
Move comments to correct places.
yo1995 Sep 9, 2020
87f707b
Merge branch 'v.next' into Viv/configureSubnetwork_vNext
vquach2404 Sep 9, 2020
ce07368
Replaced nils with updatecellstates
vquach2404 Sep 10, 2020
98ba2b2
Merge branch 'v.next' into Viv/configureSubnetwork_vNext
vquach2404 Sep 10, 2020
7e771e8
Readded files to copy files and made number of lines 0
vquach2404 Sep 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions arcgis-ios-sdk-samples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
001ECB5E248B002B009AC6C0 /* FeatureCollectionLayerFromPortalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 001ECB59248B002B009AC6C0 /* FeatureCollectionLayerFromPortalViewController.swift */; };
001ECB60248B002B009AC6C0 /* FeatureCollectionLayerFromPortal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 001ECB5B248B002B009AC6C0 /* FeatureCollectionLayerFromPortal.storyboard */; };
001ECB63248B0093009AC6C0 /* FeatureCollectionLayerFromPortalViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 001ECB59248B002B009AC6C0 /* FeatureCollectionLayerFromPortalViewController.swift */; };
003BC30F24E5E44E00F65746 /* ConfigureSubnetworkTraceOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 003BC30E24E5E44E00F65746 /* ConfigureSubnetworkTraceOptionsViewController.swift */; };
003BC31224E5E53200F65746 /* ConfigureSubnetworkTraceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 003BC31124E5E53200F65746 /* ConfigureSubnetworkTraceViewController.swift */; };
00686FD02480889900EDA705 /* NavigateARNavigatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00686FCF2480889900EDA705 /* NavigateARNavigatorViewController.swift */; };
00686FD52481CF4D00EDA705 /* NavigateARRoutePlannerViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00C024E42475E4AB00E1DA8D /* NavigateARRoutePlannerViewController.swift */; };
00686FD62481CF4D00EDA705 /* NavigateARNavigatorViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00686FCF2480889900EDA705 /* NavigateARNavigatorViewController.swift */; };
Expand Down Expand Up @@ -799,6 +801,7 @@
F140E1EB23F35E92008AC44E /* DisplayAnnotationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F140E1EA23F35E92008AC44E /* DisplayAnnotationViewController.swift */; };
F140E1ED23F35EA6008AC44E /* DisplayAnnotation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F140E1EC23F35EA6008AC44E /* DisplayAnnotation.storyboard */; };
F140E1EE23F36707008AC44E /* DisplayAnnotationViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = F140E1EA23F35E92008AC44E /* DisplayAnnotationViewController.swift */; };
F14A8F012474AD9D00242D96 /* ConfigureSubnetworkTrace.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F14A8F002474AD9D00242D96 /* ConfigureSubnetworkTrace.storyboard */; };
F14F2CA323FC768200693196 /* DisplaySubtypeSettingsViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = F1987D0223F7677E00DF41CC /* DisplaySubtypeSettingsViewController.swift */; };
F151AB8C22D7B0CA00055E45 /* MontereyElevation.dt2 in Resources */ = {isa = PBXBuildFile; fileRef = F151AB8B22D7B0CA00055E45 /* MontereyElevation.dt2 */; settings = {ASSET_TAGS = (MontereyElevationRaster, ); }; };
F151AB8D22D7B24D00055E45 /* CreateTerrainSurfaceFromLocalRasterViewController.swift in CopyFiles */ = {isa = PBXBuildFile; fileRef = F1E4B10B22D6659D005FDB4D /* CreateTerrainSurfaceFromLocalRasterViewController.swift */; };
Expand Down Expand Up @@ -881,6 +884,8 @@
dstPath = "";
dstSubfolderSpec = 7;
files = (
0094D34724E769D5007671A3 /* ConfigureSubnetworkTraceViewController.swift in CopyFiles */,
0094D34524E76907007671A3 /* ConfigureSubnetworkTraceOptionsViewController.swift in CopyFiles */,
philium marked this conversation as resolved.
Show resolved Hide resolved
008D175A24EF35800001BB8F /* EditWithBranchVersioningViewController.swift in CopyFiles */,
F17961A124DA3A27006FE7C1 /* EditFeaturesWithFeatureLinkedAnnotationViewController.swift in CopyFiles */,
00166C8C24D236A300DD317E /* RealisticLightingAndShadowsViewController.swift in CopyFiles */,
Expand Down Expand Up @@ -1164,6 +1169,8 @@
001ECB032486DD8B009AC6C0 /* NavigateARCalibrationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigateARCalibrationViewController.swift; sourceTree = "<group>"; };
001ECB59248B002B009AC6C0 /* FeatureCollectionLayerFromPortalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureCollectionLayerFromPortalViewController.swift; sourceTree = "<group>"; };
001ECB5B248B002B009AC6C0 /* FeatureCollectionLayerFromPortal.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = FeatureCollectionLayerFromPortal.storyboard; sourceTree = "<group>"; };
003BC30E24E5E44E00F65746 /* ConfigureSubnetworkTraceOptionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigureSubnetworkTraceOptionsViewController.swift; sourceTree = "<group>"; };
003BC31124E5E53200F65746 /* ConfigureSubnetworkTraceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigureSubnetworkTraceViewController.swift; sourceTree = "<group>"; };
00686FCF2480889900EDA705 /* NavigateARNavigatorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigateARNavigatorViewController.swift; sourceTree = "<group>"; };
008D175124EEEEBD0001BB8F /* loudoun_anno.geodatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = loudoun_anno.geodatabase; sourceTree = "<group>"; };
008D175624EEF3FE0001BB8F /* EditWithBranchVersioningViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditWithBranchVersioningViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1716,6 +1723,7 @@
F1124F0B24CFA97000E672EC /* EditFeaturesWithFeatureLinkedAnnotationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditFeaturesWithFeatureLinkedAnnotationViewController.swift; sourceTree = "<group>"; };
F140E1EA23F35E92008AC44E /* DisplayAnnotationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayAnnotationViewController.swift; sourceTree = "<group>"; };
F140E1EC23F35EA6008AC44E /* DisplayAnnotation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = DisplayAnnotation.storyboard; sourceTree = "<group>"; };
F14A8F002474AD9D00242D96 /* ConfigureSubnetworkTrace.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ConfigureSubnetworkTrace.storyboard; sourceTree = "<group>"; };
F151AB8B22D7B0CA00055E45 /* MontereyElevation.dt2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MontereyElevation.dt2; sourceTree = "<group>"; };
F15CF0C823EE273A0038F052 /* DisplaySubtypeFeatureLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplaySubtypeFeatureLayerViewController.swift; sourceTree = "<group>"; };
F15CF0CA23EE27F00038F052 /* DisplaySubtypeFeatureLayer.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = DisplaySubtypeFeatureLayer.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4088,6 +4096,7 @@
D98CC08F22E25D8200618682 /* Utility network */ = {
isa = PBXGroup;
children = (
F14A8EFC2474AD3A00242D96 /* Configure subnetwork trace */,
F1D50229245243AD00583CFB /* Display utility associations */,
00E5B7CB2458FE6D00B11973 /* Perform valve isolation trace */,
D98CC09022E25E3300618682 /* Trace utility network */,
Expand Down Expand Up @@ -4303,6 +4312,16 @@
path = "Display annotation";
sourceTree = "<group>";
};
F14A8EFC2474AD3A00242D96 /* Configure subnetwork trace */ = {
isa = PBXGroup;
children = (
003BC31124E5E53200F65746 /* ConfigureSubnetworkTraceViewController.swift */,
003BC30E24E5E44E00F65746 /* ConfigureSubnetworkTraceOptionsViewController.swift */,
F14A8F002474AD9D00242D96 /* ConfigureSubnetworkTrace.storyboard */,
);
path = "Configure subnetwork trace";
sourceTree = "<group>";
};
F15CF0C723EE26CB0038F052 /* Display subtype feature layer */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4720,6 +4739,7 @@
3E5849001B9123E900AB3CE9 /* FeatureLayerURL.storyboard in Resources */,
00ADC3BD2464D45C00A3B88D /* AnimateImagesWithImageOverlay.storyboard in Resources */,
3E8A25911D36B97A00D14F08 /* MapLoaded.storyboard in Resources */,
F14A8F012474AD9D00242D96 /* ConfigureSubnetworkTrace.storyboard in Resources */,
C7E9D7C821C0500300E6C47E /* Buffer.storyboard in Resources */,
3ED028E91B8E3AA500ACA70D /* FLQuery.storyboard in Resources */,
E4B2E2651FE31E5200E610FF /* bradle.3ds in Resources */,
Expand Down Expand Up @@ -4976,6 +4996,7 @@
C7BE9C4F219F4FE0003A03D2 /* SpatialRelationshipsTableViewController.swift in Sources */,
3E4BF44C1C5AF04300D85919 /* FindPlaceViewController.swift in Sources */,
3E8A05CF1ECE68E80032231C /* PlaneStatsViewController.swift in Sources */,
003BC30F24E5E44E00F65746 /* ConfigureSubnetworkTraceOptionsViewController.swift in Sources */,
3EFDE0F81E36ABB700CBCD92 /* FeatureCollectionLayerQueryViewController.swift in Sources */,
3EABC7A21DB1793000C161C6 /* StretchRendererSettingsViewController.swift in Sources */,
F1987D0323F7677E00DF41CC /* DisplaySubtypeSettingsViewController.swift in Sources */,
Expand All @@ -4988,6 +5009,7 @@
3E5E09401EF4567A00FF3454 /* RelatedFeaturesViewController.swift in Sources */,
D97B7E3C1FD9BE2B00E1239D /* SymbolizeShapefileViewController.swift in Sources */,
C7D0EEDA215EA60800ECDD2C /* DisplayKMLNetworkLinksViewController.swift in Sources */,
003BC31224E5E53200F65746 /* ConfigureSubnetworkTraceViewController.swift in Sources */,
3EEA06101D21C44000E03774 /* DisplaySceneViewController.swift in Sources */,
4C0FD7CF22652E3B0042DE31 /* ReadSymbolsFromMobileStyleSymbolViewController.swift in Sources */,
10859BAC1FE0AAE400F6E552 /* FeatureLayerExtrusionViewController.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1727,6 +1727,14 @@
<key>displayName</key>
<string>Perform valve isolation trace</string>
</dict>
<dict>
<key>descriptionText</key>
<string>Get a server-defined trace configuration for a given tier and modify its traversability scope, add new condition barriers, and control what is included in the subnetwork trace result.</string>
<key>storyboardName</key>
<string>ConfigureSubnetworkTrace</string>
<key>displayName</key>
<string>Configure subnetwork trace</string>
</dict>
</array>
</dict>
<dict>
Expand Down
Loading