Dev (#124)

Dev - 10.4 release has been posted to ArcGIS Online; need to now sync up dev branch to master branch and tag master as 10.4 release
Esri · May 2, 2016 · 3856557 · 3856557
1 parent 6038468
commit 3856557
Show file tree

Hide file tree

Showing 63 changed files with 7,674 additions and 1,728 deletions.
diff --git a/src/OSMClassExtension/OSMClassExtension.csproj b/src/OSMClassExtension/OSMClassExtension.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ESRI.ArcGIS.OSM.OSMClassExtension</RootNamespace>
     <AssemblyName>OSMClassExtension</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -52,6 +52,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RegisterForComInterop>false</RegisterForComInterop>
     <PlatformTarget>x86</PlatformTarget>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -62,43 +63,44 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RegisterForComInterop>false</RegisterForComInterop>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ESRI.ArcGIS.Carto, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.DataSourcesGDB, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Display, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Geometry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.System, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.SystemUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="ESRI.ArcGIS.Version, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/OSMClassExtension/OSMClassExtensionManager.cs b/src/OSMClassExtension/OSMClassExtensionManager.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.

diff --git a/src/OSMClassExtension/OSMClassExtensionStrings.Designer.cs b/src/OSMClassExtension/OSMClassExtensionStrings.Designer.cs
diff --git a/src/OSMClassExtension/OSMUtility.cs b/src/OSMClassExtension/OSMUtility.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.
@@ -462,48 +462,52 @@ public tag[] retrieveOSMTags(IRow row, int osmTagFieldIndex, IWorkspace workspac
                 }
 
                 IEnumDomain enumDomain = workspaceDomains.Domains;
-                enumDomain.Reset();
-                IDomain currentDomain = enumDomain.Next();
 
-                while (currentDomain != null)
+                if (enumDomain != null)
                 {
-                    int extensionPosition = currentDomain.Name.IndexOf(extensionString);
+                    enumDomain.Reset();
+                    IDomain currentDomain = enumDomain.Next();
 
-                    // only check the attributes that are relevant for the current geometry type
-                    if (extensionPosition > 0)
+                    while (currentDomain != null)
                     {
-                        string attributeName = currentDomain.Name.Substring(0, extensionPosition);
-                        int attributefieldIndex = row.Fields.FindField(attributeName);
+                        int extensionPosition = currentDomain.Name.IndexOf(extensionString);
 
-                        if (attributefieldIndex > -1)
+                        // only check the attributes that are relevant for the current geometry type
+                        if (extensionPosition > 0)
                         {
-                            object attributeValue = row.get_Value(attributefieldIndex);
+                            string attributeName = currentDomain.Name.Substring(0, extensionPosition);
+                            int attributefieldIndex = row.Fields.FindField(attributeName);
 
-                            if (attributeValue != DBNull.Value)
+                            if (attributefieldIndex > -1)
                             {
-                                // check if the current attribute value is already in the tag listing
-                                if (tagDictionary.ContainsKey(attributeName) == false)
-                                {
-                                    // create a new tag to store
-                                    tag explicitAttributeTag = new tag();
-                                    explicitAttributeTag.k = attributeName;
-                                    explicitAttributeTag.v = Convert.ToString(attributeValue);
+                                object attributeValue = row.get_Value(attributefieldIndex);
 
-                                    if (String.IsNullOrEmpty(explicitAttributeTag.v) == false)
+                                if (attributeValue != DBNull.Value)
+                                {
+                                    // check if the current attribute value is already in the tag listing
+                                    if (tagDictionary.ContainsKey(attributeName) == false)
                                     {
-                                        tagDictionary.Add(attributeName, explicitAttributeTag);
+                                        // create a new tag to store
+                                        tag explicitAttributeTag = new tag();
+                                        explicitAttributeTag.k = attributeName;
+                                        explicitAttributeTag.v = Convert.ToString(attributeValue);
+
+                                        if (String.IsNullOrEmpty(explicitAttributeTag.v) == false)
+                                        {
+                                            tagDictionary.Add(attributeName, explicitAttributeTag);
+                                        }
                                     }
                                 }
                             }
                         }
+
+                        currentDomain = enumDomain.Next();
                     }
 
-                    currentDomain = enumDomain.Next();
+                    // copy the values back into the array
+                    retrievedTags = new tag[tagDictionary.Count];
+                    tagDictionary.Values.CopyTo(retrievedTags, 0);
                 }
-
-                // copy the values back into the array
-                retrievedTags = new tag[tagDictionary.Count];
-                tagDictionary.Values.CopyTo(retrievedTags, 0);
             }
             return retrievedTags;
         }
@@ -1387,6 +1391,12 @@ public bool DoesHaveKeys(way currentway)
             IList<tag> relevantTags = new List<tag>();
             bool doesHaveKeys = false;
 
+            if (currentway == null)
+                throw new ArgumentNullException("currentway", "Unexpected value.");
+
+            if (currentway.tag == null)
+                return doesHaveKeys;
+
             try
             {
                 string[] non_relevant = { "created_by", "source", "attribution", "note", "version", "type" };

diff --git a/src/OSMClassExtension/OpenStreetMapClassExtension.cs b/src/OSMClassExtension/OpenStreetMapClassExtension.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.
@@ -2994,6 +2994,22 @@ private IPointCollection checkAllPoints(IFeature newlyCreatedFeature, IFeatureCl
                                     foundFeature.Store();
                                 }
 
+                                else if (!comparison && action.ToLower(CultureInfo.InvariantCulture).Equals("create"))
+                                {
+                                    // for split the new higher-order geometry contains the (existing) nodes but it will also
+                                    // be deleted later-on due to the split behavior
+                                    // update the ref count on the node
+                                    if (pointwayRefCountFieldIndex > -1)
+                                    {
+                                        int currentRefCount = Convert.ToInt32(foundFeature.get_Value(pointwayRefCountFieldIndex));
+
+                                        currentRefCount = currentRefCount + 1;
+                                        foundFeature.set_Value(pointwayRefCountFieldIndex, currentRefCount);
+
+                                        foundFeature.Store();
+                                    }
+                                }
+
                                 addVertexCounter = addVertexCounter + 1;
                             }
                             else

diff --git a/src/OSMClassExtension/Properties/AssemblyInfo.cs b/src/OSMClassExtension/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ESRI")]
 [assembly: AssemblyProduct("ArcGIS Editor for OpenStreetMap")]
-[assembly: AssemblyCopyright("Copyright © ESRI 2010 - 2012")]
+[assembly: AssemblyCopyright("Copyright © ESRI 2010 - 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/src/OSMClassExtension/SqlFormatter.cs b/src/OSMClassExtension/SqlFormatter.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.

diff --git a/src/OSMClassExtension/osm_v0_6.cs b/src/OSMClassExtension/osm_v0_6.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.

diff --git a/src/OSMClassExtension64/ComReleaser.cs b/src/OSMClassExtension64/ComReleaser.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.

diff --git a/src/OSMClassExtension64/OSMClassExtension64.csproj b/src/OSMClassExtension64/OSMClassExtension64.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ESRI.ArcGIS.OSM.OSMClassExtension</RootNamespace>
     <AssemblyName>OSMClassExtension64</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <SccProjectName>
@@ -21,6 +21,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,6 +33,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
     <RegisterForComInterop>false</RegisterForComInterop>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,49 +42,48 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ESRI.ArcGIS.Carto, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="ESRI.ArcGIS.Carto, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.DataSourcesGDB, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.DataSourcesGDB, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.Display, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.Display, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.Geometry, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.Geometry, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.System, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.System, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.SystemUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.SystemUI, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ESRI.ArcGIS.Version, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
+    <Reference Include="ESRI.ArcGIS.Version, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>

diff --git a/src/OSMEditor/BasicAuthenticationCtrl.cs b/src/OSMEditor/BasicAuthenticationCtrl.cs
@@ -1,4 +1,4 @@
-// (c) Copyright Esri, 2010 - 2013
+// (c) Copyright Esri, 2010 - 2016
 // This source is subject to the Apache 2.0 License.
 // Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
 // All other rights reserved.