Merge remote-tracking branch 'origin/develop'

Esri · Jun 22, 2017 · 0841fc6 · 0841fc6
2 parents 3c153a5 + 8be22c6
commit 0841fc6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/PhotoSurvey.tbx b/PhotoSurvey.tbx
diff --git a/js/configuration.json b/js/configuration.json
@@ -2,7 +2,7 @@
     "source": "dbd49c155bf249f79bf1e518d56dbbb2",
     "folderId": "052b07ec56b3462c943adcc6959354ec",
     "values": {
-        "webmap": "f6a4a4c4252c44029b9f41bde775154f",
+        "webmap": "3a1d33996b0c480b9e34b3221a80ebeb",
         "splashBackgroundUrl": "images/splash.jpg",
         "useWebmapOrigImg": true,
         "includeOverviewMap": false,

diff --git a/loadphotopoints.py b/loadphotopoints.py
@@ -2,7 +2,7 @@
 	@author: bus
 	@contact: [email protected]
 	@company: Esri
-	@version: 1.0.0
+	@version: 1.3.0
 	@description: Photo Survey Tool to load photos
 	@requirements: Python 2.7.x or higher, ArcGIS 10.2, 10.3.x, 10.4 (also ArcGIS Pro)
 	@copyright: Esri, 2015
@@ -523,7 +523,7 @@ def shift_photopoints(in_features, x_shift=None, y_shift=None):
 if CameraInput == 'Associate Geotagged Photo with Point (photo has location)':
 
     arcpy.AddMessage("Step 3:  Adding application required fields")
-    arcpy.AddField_management(ParcelPointHelper, "BSTPHOTOID", "TEXT", "", "", "5", "Best Photo Identifier", "NULLABLE", "NON_REQUIRED", "")
+    arcpy.AddField_management(ParcelPointHelper, "BSTPHOTOID", "TEXT", "", "", "25", "Best Photo Identifier", "NULLABLE", "NON_REQUIRED", "")
     arcpy.AddField_management(ParcelPointHelper, "SRVNAME", "TEXT", "", "", "25", "Surveyor Name", "NULLABLE", "NON_REQUIRED", "")
     arcpy.AddMessage("Step 4:  Finalizing photo survey feature class")
     arcpy.AddMessage("Step 5:  Creating Photo Attachments")
@@ -548,7 +548,7 @@ def shift_photopoints(in_features, x_shift=None, y_shift=None):
 
 
     arcpy.AddMessage("Step 3:  Adding application required fields")
-    arcpy.AddField_management(ParcelPointHelper, "BSTPHOTOID", "TEXT", "", "", "5", "Best Photo Identifier", "NULLABLE", "NON_REQUIRED", "")
+    arcpy.AddField_management(ParcelPointHelper, "BSTPHOTOID", "TEXT", "", "", "25", "Best Photo Identifier", "NULLABLE", "NON_REQUIRED", "")
     arcpy.AddField_management(ParcelPointHelper, "SRVNAME", "TEXT", "", "", "25", "Surveyor Name", "NULLABLE", "NON_REQUIRED", "")
     arcpy.AddMessage("Step 4:  Finalizing photo survey feature class")
     arcpy.AddMessage("Step 5:  Creating Photo Attachments")
@@ -613,7 +613,7 @@ def shift_photopoints(in_features, x_shift=None, y_shift=None):
 	arcpy.AddMessage("Step 10: Cleaning up staging geodatabase")
 
 	arcpy.AddMessage("Step 11: Adding application required fields")
-	arcpy.AddField_management(ParcelPointHelper, "BSTPHOTOID", "TEXT", "", "", "5", "Best Photo Identifier", "NULLABLE", "NON_REQUIRED", "")
+	arcpy.AddField_management(ParcelPointHelper, "BSTPHOTOID", "TEXT", "", "", "25", "Best Photo Identifier", "NULLABLE", "NON_REQUIRED", "")
 	arcpy.AddField_management(ParcelPointHelper, "SRVNAME", "TEXT", "", "", "25", "Surveyor Name", "NULLABLE", "NON_REQUIRED", "")
 	arcpy.AddMessage("Step 12: Finalizing photo survey feature class")
 

diff --git a/oauth-callback-twitter.html b/oauth-callback-twitter.html
@@ -2,6 +2,21 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <!--
+     | Copyright 2015 Esri
+     |
+     | Licensed under the Apache License, Version 2.0 (the "License");
+     | you may not use this file except in compliance with the License.
+     | You may obtain a copy of the License at
+     |
+     |    http://www.apache.org/licenses/LICENSE-2.0
+     |
+     | Unless required by applicable law or agreed to in writing, software
+     | distributed under the License is distributed on an "AS IS" BASIS,
+     | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     | See the License for the specific language governing permissions and
+     | limitations under the License.
+    -->
     <title>OAuth Popup Callback</title>
     <style type="text/css">
         html,