Skip to content

Commit 3856557

Browse files
eggwhiteseggwhites
committed
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
1 parent 6038468 commit 3856557

63 files changed

Lines changed: 7674 additions & 1728 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/OSMClassExtension/OSMClassExtension.csproj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ESRI.ArcGIS.OSM.OSMClassExtension</RootNamespace>
1212
<AssemblyName>OSMClassExtension</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -52,6 +52,7 @@
5252
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5353
<RegisterForComInterop>false</RegisterForComInterop>
5454
<PlatformTarget>x86</PlatformTarget>
55+
<Prefer32Bit>false</Prefer32Bit>
5556
</PropertyGroup>
5657
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5758
<DebugType>pdbonly</DebugType>
@@ -62,43 +63,44 @@
6263
<WarningLevel>4</WarningLevel>
6364
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6465
<RegisterForComInterop>false</RegisterForComInterop>
66+
<Prefer32Bit>false</Prefer32Bit>
6567
</PropertyGroup>
6668
<ItemGroup>
6769
<Reference Include="ESRI.ArcGIS.Carto, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
6870
<SpecificVersion>False</SpecificVersion>
69-
<EmbedInteropTypes>True</EmbedInteropTypes>
71+
<EmbedInteropTypes>False</EmbedInteropTypes>
7072
</Reference>
7173
<Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
7274
<SpecificVersion>False</SpecificVersion>
73-
<EmbedInteropTypes>True</EmbedInteropTypes>
75+
<EmbedInteropTypes>False</EmbedInteropTypes>
7476
</Reference>
7577
<Reference Include="ESRI.ArcGIS.DataSourcesGDB, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
7678
<SpecificVersion>False</SpecificVersion>
77-
<EmbedInteropTypes>True</EmbedInteropTypes>
79+
<EmbedInteropTypes>False</EmbedInteropTypes>
7880
</Reference>
7981
<Reference Include="ESRI.ArcGIS.Display, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
8082
<SpecificVersion>False</SpecificVersion>
81-
<EmbedInteropTypes>True</EmbedInteropTypes>
83+
<EmbedInteropTypes>False</EmbedInteropTypes>
8284
</Reference>
8385
<Reference Include="ESRI.ArcGIS.Editor, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
8486
<SpecificVersion>False</SpecificVersion>
85-
<EmbedInteropTypes>True</EmbedInteropTypes>
87+
<EmbedInteropTypes>False</EmbedInteropTypes>
8688
</Reference>
8789
<Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
8890
<SpecificVersion>False</SpecificVersion>
89-
<EmbedInteropTypes>True</EmbedInteropTypes>
91+
<EmbedInteropTypes>False</EmbedInteropTypes>
9092
</Reference>
9193
<Reference Include="ESRI.ArcGIS.Geometry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
9294
<SpecificVersion>False</SpecificVersion>
93-
<EmbedInteropTypes>True</EmbedInteropTypes>
95+
<EmbedInteropTypes>False</EmbedInteropTypes>
9496
</Reference>
9597
<Reference Include="ESRI.ArcGIS.System, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
9698
<SpecificVersion>False</SpecificVersion>
97-
<EmbedInteropTypes>True</EmbedInteropTypes>
99+
<EmbedInteropTypes>False</EmbedInteropTypes>
98100
</Reference>
99101
<Reference Include="ESRI.ArcGIS.SystemUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=x86">
100102
<SpecificVersion>False</SpecificVersion>
101-
<EmbedInteropTypes>True</EmbedInteropTypes>
103+
<EmbedInteropTypes>False</EmbedInteropTypes>
102104
</Reference>
103105
<Reference Include="ESRI.ArcGIS.Version, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
104106
<SpecificVersion>False</SpecificVersion>

‎src/OSMClassExtension/OSMClassExtensionManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// (c) Copyright Esri, 2010 - 2013
1+
// (c) Copyright Esri, 2010 - 2016
22
// This source is subject to the Apache 2.0 License.
33
// Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
44
// All other rights reserved.

‎src/OSMClassExtension/OSMClassExtensionStrings.Designer.cs‎

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/OSMClassExtension/OSMUtility.cs‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// (c) Copyright Esri, 2010 - 2013
1+
// (c) Copyright Esri, 2010 - 2016
22
// This source is subject to the Apache 2.0 License.
33
// Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
44
// All other rights reserved.
@@ -462,48 +462,52 @@ public tag[] retrieveOSMTags(IRow row, int osmTagFieldIndex, IWorkspace workspac
462462
}
463463

464464
IEnumDomain enumDomain = workspaceDomains.Domains;
465-
enumDomain.Reset();
466-
IDomain currentDomain = enumDomain.Next();
467465

468-
while (currentDomain != null)
466+
if (enumDomain != null)
469467
{
470-
int extensionPosition = currentDomain.Name.IndexOf(extensionString);
468+
enumDomain.Reset();
469+
IDomain currentDomain = enumDomain.Next();
471470

472-
// only check the attributes that are relevant for the current geometry type
473-
if (extensionPosition > 0)
471+
while (currentDomain != null)
474472
{
475-
string attributeName = currentDomain.Name.Substring(0, extensionPosition);
476-
int attributefieldIndex = row.Fields.FindField(attributeName);
473+
int extensionPosition = currentDomain.Name.IndexOf(extensionString);
477474

478-
if (attributefieldIndex > -1)
475+
// only check the attributes that are relevant for the current geometry type
476+
if (extensionPosition > 0)
479477
{
480-
object attributeValue = row.get_Value(attributefieldIndex);
478+
string attributeName = currentDomain.Name.Substring(0, extensionPosition);
479+
int attributefieldIndex = row.Fields.FindField(attributeName);
481480

482-
if (attributeValue != DBNull.Value)
481+
if (attributefieldIndex > -1)
483482
{
484-
// check if the current attribute value is already in the tag listing
485-
if (tagDictionary.ContainsKey(attributeName) == false)
486-
{
487-
// create a new tag to store
488-
tag explicitAttributeTag = new tag();
489-
explicitAttributeTag.k = attributeName;
490-
explicitAttributeTag.v = Convert.ToString(attributeValue);
483+
object attributeValue = row.get_Value(attributefieldIndex);
491484

492-
if (String.IsNullOrEmpty(explicitAttributeTag.v) == false)
485+
if (attributeValue != DBNull.Value)
486+
{
487+
// check if the current attribute value is already in the tag listing
488+
if (tagDictionary.ContainsKey(attributeName) == false)
493489
{
494-
tagDictionary.Add(attributeName, explicitAttributeTag);
490+
// create a new tag to store
491+
tag explicitAttributeTag = new tag();
492+
explicitAttributeTag.k = attributeName;
493+
explicitAttributeTag.v = Convert.ToString(attributeValue);
494+
495+
if (String.IsNullOrEmpty(explicitAttributeTag.v) == false)
496+
{
497+
tagDictionary.Add(attributeName, explicitAttributeTag);
498+
}
495499
}
496500
}
497501
}
498502
}
503+
504+
currentDomain = enumDomain.Next();
499505
}
500506

501-
currentDomain = enumDomain.Next();
507+
// copy the values back into the array
508+
retrievedTags = new tag[tagDictionary.Count];
509+
tagDictionary.Values.CopyTo(retrievedTags, 0);
502510
}
503-
504-
// copy the values back into the array
505-
retrievedTags = new tag[tagDictionary.Count];
506-
tagDictionary.Values.CopyTo(retrievedTags, 0);
507511
}
508512
return retrievedTags;
509513
}
@@ -1387,6 +1391,12 @@ public bool DoesHaveKeys(way currentway)
13871391
IList<tag> relevantTags = new List<tag>();
13881392
bool doesHaveKeys = false;
13891393

1394+
if (currentway == null)
1395+
throw new ArgumentNullException("currentway", "Unexpected value.");
1396+
1397+
if (currentway.tag == null)
1398+
return doesHaveKeys;
1399+
13901400
try
13911401
{
13921402
string[] non_relevant = { "created_by", "source", "attribution", "note", "version", "type" };

‎src/OSMClassExtension/OpenStreetMapClassExtension.cs‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// (c) Copyright Esri, 2010 - 2013
1+
// (c) Copyright Esri, 2010 - 2016
22
// This source is subject to the Apache 2.0 License.
33
// Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
44
// All other rights reserved.
@@ -2994,6 +2994,22 @@ private IPointCollection checkAllPoints(IFeature newlyCreatedFeature, IFeatureCl
29942994
foundFeature.Store();
29952995
}
29962996

2997+
else if (!comparison && action.ToLower(CultureInfo.InvariantCulture).Equals("create"))
2998+
{
2999+
// for split the new higher-order geometry contains the (existing) nodes but it will also
3000+
// be deleted later-on due to the split behavior
3001+
// update the ref count on the node
3002+
if (pointwayRefCountFieldIndex > -1)
3003+
{
3004+
int currentRefCount = Convert.ToInt32(foundFeature.get_Value(pointwayRefCountFieldIndex));
3005+
3006+
currentRefCount = currentRefCount + 1;
3007+
foundFeature.set_Value(pointwayRefCountFieldIndex, currentRefCount);
3008+
3009+
foundFeature.Store();
3010+
}
3011+
}
3012+
29973013
addVertexCounter = addVertexCounter + 1;
29983014
}
29993015
else

‎src/OSMClassExtension/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("ESRI")]
1212
[assembly: AssemblyProduct("ArcGIS Editor for OpenStreetMap")]
13-
[assembly: AssemblyCopyright("Copyright © ESRI 2010 - 2012")]
13+
[assembly: AssemblyCopyright("Copyright © ESRI 2010 - 2016")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎src/OSMClassExtension/SqlFormatter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// (c) Copyright Esri, 2010 - 2013
1+
// (c) Copyright Esri, 2010 - 2016
22
// This source is subject to the Apache 2.0 License.
33
// Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
44
// All other rights reserved.

‎src/OSMClassExtension/osm_v0_6.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// (c) Copyright Esri, 2010 - 2013
1+
// (c) Copyright Esri, 2010 - 2016
22
// This source is subject to the Apache 2.0 License.
33
// Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
44
// All other rights reserved.

‎src/OSMClassExtension64/ComReleaser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// (c) Copyright Esri, 2010 - 2013
1+
// (c) Copyright Esri, 2010 - 2016
22
// This source is subject to the Apache 2.0 License.
33
// Please see http://www.apache.org/licenses/LICENSE-2.0.html for details.
44
// All other rights reserved.

‎src/OSMClassExtension64/OSMClassExtension64.csproj‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ESRI.ArcGIS.OSM.OSMClassExtension</RootNamespace>
1212
<AssemblyName>OSMClassExtension64</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<IsWebBootstrapper>false</IsWebBootstrapper>
1616
<SccProjectName>
@@ -21,6 +21,7 @@
2121
</SccAuxPath>
2222
<SccProvider>
2323
</SccProvider>
24+
<TargetFrameworkProfile />
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2627
<DebugSymbols>true</DebugSymbols>
@@ -32,6 +33,7 @@
3233
<WarningLevel>4</WarningLevel>
3334
<PlatformTarget>x64</PlatformTarget>
3435
<RegisterForComInterop>false</RegisterForComInterop>
36+
<Prefer32Bit>false</Prefer32Bit>
3537
</PropertyGroup>
3638
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3739
<DebugType>pdbonly</DebugType>
@@ -40,49 +42,48 @@
4042
<DefineConstants>TRACE</DefineConstants>
4143
<ErrorReport>prompt</ErrorReport>
4244
<WarningLevel>4</WarningLevel>
45+
<Prefer32Bit>false</Prefer32Bit>
4346
</PropertyGroup>
4447
<ItemGroup>
45-
<Reference Include="ESRI.ArcGIS.Carto, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
48+
<Reference Include="ESRI.ArcGIS.Carto, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
4749
<EmbedInteropTypes>True</EmbedInteropTypes>
48-
<Private>False</Private>
4950
</Reference>
50-
<Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
51+
<Reference Include="ESRI.ArcGIS.DataSourcesFile, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
5152
<SpecificVersion>False</SpecificVersion>
52-
<EmbedInteropTypes>True</EmbedInteropTypes>
53+
<EmbedInteropTypes>False</EmbedInteropTypes>
5354
<Private>False</Private>
5455
</Reference>
55-
<Reference Include="ESRI.ArcGIS.DataSourcesGDB, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
56+
<Reference Include="ESRI.ArcGIS.DataSourcesGDB, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
5657
<SpecificVersion>False</SpecificVersion>
57-
<EmbedInteropTypes>True</EmbedInteropTypes>
58+
<EmbedInteropTypes>False</EmbedInteropTypes>
5859
<Private>False</Private>
5960
</Reference>
60-
<Reference Include="ESRI.ArcGIS.Display, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
61+
<Reference Include="ESRI.ArcGIS.Display, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
6162
<SpecificVersion>False</SpecificVersion>
62-
<EmbedInteropTypes>True</EmbedInteropTypes>
63+
<EmbedInteropTypes>False</EmbedInteropTypes>
6364
<Private>False</Private>
6465
</Reference>
65-
<Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
66+
<Reference Include="ESRI.ArcGIS.Geodatabase, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
6667
<SpecificVersion>False</SpecificVersion>
67-
<EmbedInteropTypes>True</EmbedInteropTypes>
68+
<EmbedInteropTypes>False</EmbedInteropTypes>
6869
<Private>False</Private>
6970
</Reference>
70-
<Reference Include="ESRI.ArcGIS.Geometry, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
71+
<Reference Include="ESRI.ArcGIS.Geometry, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
7172
<SpecificVersion>False</SpecificVersion>
72-
<EmbedInteropTypes>True</EmbedInteropTypes>
73+
<EmbedInteropTypes>False</EmbedInteropTypes>
7374
<Private>False</Private>
7475
</Reference>
75-
<Reference Include="ESRI.ArcGIS.System, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
76+
<Reference Include="ESRI.ArcGIS.System, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
7677
<SpecificVersion>False</SpecificVersion>
77-
<EmbedInteropTypes>True</EmbedInteropTypes>
78+
<EmbedInteropTypes>False</EmbedInteropTypes>
7879
<Private>False</Private>
7980
</Reference>
80-
<Reference Include="ESRI.ArcGIS.SystemUI, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
81+
<Reference Include="ESRI.ArcGIS.SystemUI, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
8182
<SpecificVersion>False</SpecificVersion>
82-
<EmbedInteropTypes>True</EmbedInteropTypes>
83+
<EmbedInteropTypes>False</EmbedInteropTypes>
8384
<Private>False</Private>
8485
</Reference>
85-
<Reference Include="ESRI.ArcGIS.Version, Version=10.1.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
86+
<Reference Include="ESRI.ArcGIS.Version, Version=10.4.0.0, Culture=neutral, PublicKeyToken=8fc3cc631e44ad86, processorArchitecture=MSIL">
8687
<SpecificVersion>False</SpecificVersion>
8788
<Private>False</Private>
8889
</Reference>

0 commit comments

Comments
 (0)