Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorAlex Zolotarev <alex@mapswithme.com>2013-07-06 18:53:40 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:58:19 +0300
commit12b40fc5d7187b9e507710f58fc99fa589c65944 (patch)
treec84647b7d6d1f1b6101d71201173775c358b2723 /api
parent0ae78bd6d112175988485aab8fa28495089fc4e6 (diff)
Api has moved to separate repositories
Diffstat (limited to 'api')
-rw-r--r--api/android/.gitignore9
-rw-r--r--api/android/README.html175
-rw-r--r--api/android/README.md167
-rw-r--r--api/android/lib/AndroidManifest.xml5
-rw-r--r--api/android/lib/build.xml92
-rw-r--r--api/android/lib/proguard-project.txt20
-rw-r--r--api/android/lib/project.properties15
-rw-r--r--api/android/lib/res/drawable/background_pattern.xml5
-rw-r--r--api/android/lib/res/drawable/btn_back_gray.xml13
-rw-r--r--api/android/lib/res/drawable/btn_back_gray_active.xml16
-rw-r--r--api/android/lib/res/drawable/btn_back_green.xml14
-rw-r--r--api/android/lib/res/drawable/btn_back_green_active.xml16
-rw-r--r--api/android/lib/res/drawable/btn_gray_selector.xml7
-rw-r--r--api/android/lib/res/drawable/btn_green_selector.xml7
-rw-r--r--api/android/lib/res/drawable/gray.xml13
-rw-r--r--api/android/lib/res/drawable/green.xml15
-rw-r--r--api/android/lib/res/drawable/overflow.xml6
-rw-r--r--api/android/lib/res/drawable/pattern.pngbin67027 -> 0 bytes
-rw-r--r--api/android/lib/res/drawable/shadow.xml13
-rw-r--r--api/android/lib/res/layout/dlg_install_mwm.xml75
-rw-r--r--api/android/lib/res/values/strings.xml9
-rw-r--r--api/android/lib/src/com/mapswithme/maps/api/Const.java51
-rw-r--r--api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java65
-rw-r--r--api/android/lib/src/com/mapswithme/maps/api/MWMPoint.java107
-rw-r--r--api/android/lib/src/com/mapswithme/maps/api/MWMResponse.java67
-rw-r--r--api/android/lib/src/com/mapswithme/maps/api/MapsWithMeApi.java203
-rwxr-xr-xapi/android/readme_to_html.sh11
-rw-r--r--api/android/sample-app-capitals/AndroidManifest.xml56
-rw-r--r--api/android/sample-app-capitals/project.properties15
-rw-r--r--api/android/sample-app-capitals/res/drawable-hdpi/ic_launcher.pngbin8680 -> 0 bytes
-rw-r--r--api/android/sample-app-capitals/res/drawable-ldpi/ic_launcher.pngbin3169 -> 0 bytes
-rw-r--r--api/android/sample-app-capitals/res/drawable-mdpi/ic_launcher.pngbin4740 -> 0 bytes
-rw-r--r--api/android/sample-app-capitals/res/drawable-xhdpi/ic_launcher.pngbin13312 -> 0 bytes
-rw-r--r--api/android/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.pngbin37471 -> 0 bytes
-rw-r--r--api/android/sample-app-capitals/res/layout/capitals_list_activity.xml48
-rw-r--r--api/android/sample-app-capitals/res/layout/city_details_activity.xml192
-rw-r--r--api/android/sample-app-capitals/res/values-sw720dp-land/dimens.xml3
-rw-r--r--api/android/sample-app-capitals/res/values-v11/styles.xml3
-rw-r--r--api/android/sample-app-capitals/res/values-v14/styles.xml3
-rw-r--r--api/android/sample-app-capitals/res/values/dimens.xml8
-rw-r--r--api/android/sample-app-capitals/res/values/strings.xml16
-rw-r--r--api/android/sample-app-capitals/res/values/styles.xml4
-rw-r--r--api/android/sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java95
-rw-r--r--api/android/sample-app-capitals/src/com/mapswithme/capitals/City.java341
-rw-r--r--api/android/sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java123
-rw-r--r--api/android/site/images/dlg.pngbin107490 -> 0 bytes
-rw-r--r--api/iOS/README.md156
-rw-r--r--api/iOS/api/MapsWithMeAPI.h68
-rw-r--r--api/iOS/api/MapsWithMeAPI.m245
-rw-r--r--api/iOS/capitals-example/Capitals.xcodeproj/project.pbxproj382
-rw-r--r--api/iOS/capitals-example/Capitals.xcodeproj/project.xcworkspace/contents.xcworkspacedata7
-rw-r--r--api/iOS/capitals-example/Capitals/100x100.pngbin14961 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/114x114.pngbin18208 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/144x144.pngbin25760 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/29x29.pngbin2235 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/50x50.pngbin5138 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/57x57.pngbin6272 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/58x58.pngbin6481 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/72x72.pngbin8975 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/AppDelegate.h39
-rw-r--r--api/iOS/capitals-example/Capitals/AppDelegate.m107
-rw-r--r--api/iOS/capitals-example/Capitals/Capitals-Info.plist80
-rw-r--r--api/iOS/capitals-example/Capitals/Capitals-Prefix.pch38
-rw-r--r--api/iOS/capitals-example/Capitals/City.h41
-rw-r--r--api/iOS/capitals-example/Capitals/City.m272
-rw-r--r--api/iOS/capitals-example/Capitals/CityDetailViewController.h35
-rw-r--r--api/iOS/capitals-example/Capitals/CityDetailViewController.m175
-rw-r--r--api/iOS/capitals-example/Capitals/CityDetailViewController.xib164
-rw-r--r--api/iOS/capitals-example/Capitals/Default-568h@2x.pngbin441443 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/Default.pngbin118726 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/Default@2x.pngbin399520 -> 0 bytes
-rw-r--r--api/iOS/capitals-example/Capitals/MasterViewController.h37
-rw-r--r--api/iOS/capitals-example/Capitals/MasterViewController.m140
-rw-r--r--api/iOS/capitals-example/Capitals/MasterViewController.xib160
-rw-r--r--api/iOS/capitals-example/Capitals/main.m39
-rw-r--r--api/iOS/site-resources/add_custom_url_scheme.pngbin722918 -> 0 bytes
-rw-r--r--api/iOS/site-resources/download_mwm_dialog.pngbin69794 -> 0 bytes
77 files changed, 0 insertions, 4288 deletions
diff --git a/api/android/.gitignore b/api/android/.gitignore
deleted file mode 100644
index ecd80c9b06..0000000000
--- a/api/android/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/
-gen/
-.settings/
-
-.classpath
-.cproject
-.project
-local.properties
-lint.xml \ No newline at end of file
diff --git a/api/android/README.html b/api/android/README.html
deleted file mode 100644
index 497578e3b6..0000000000
--- a/api/android/README.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<h1>MapsWithMe Android API: Getting Started</h1>
-
-<h2>Introduction</h2>
-
-<p>MapsWithMe Android API (hereinafter referred to as <em>&quot;API Library&quot;</em> or just <em>&quot;library&quot;</em>)
-provides interface for client application to perform next tasks:</p>
-
-<ul>
-<li>Show one or more points on offline map of <a href="http://mapswith.me/" title="MapsWithMe">MapsWithMe Application</a></li>
-<li>Come back to the client application after selecting specific point on the map, by sending <a href="http://developer.android.com/reference/android/app/PendingIntent.html" title="PendingIntent">PendingIntent</a> with point data when user asks for more information by pressing &quot;More Info&quot; button in MapsWithMe Application</li>
-<li>Map screen branding : your application&#39;s icon and name (or custom title) will be placed at the top.</li>
-</ul>
-
-<p>Thus, you can provide <strong>two way communication between your application and MapsWithMe</strong>,
-using MapsWithMe to show points of interest (POI) and providing more information in your app.</p>
-
-<p>Please refer to <a href="sample-app-capitals" title="Api Source Code">sample application</a> for demo.</p>
-
-<h2>Prerequisites</h2>
-
-<p>It is supposed that you are familiar with Android Development, and you have Android SDK and Eclipse (or another IDE of your choice) installed.
-You should be familiar with concept of <a href="http://developer.android.com/guide/components/intents-filters.html" title="Intents and Intent Filters">Intents</a>, <a href="http://developer.android.com/tools/projects/index.html#LibraryProjects" title="Android Library Project">library projects</a>, and <a href="http://developer.android.com/reference/android/app/PendingIntent.html" title="PendingIntent">PendingIntents</a> (recommended) as well.
-Your application must target at least <em>android sdk version 7</em>.</p>
-
-<h2>Integration</h2>
-
-<p>First step is to clone <a href="https://github.com/mapswithme/api-android" title="GitHub Repository">repository</a> or download it as an archive.</p>
-
-<p>When your are done you find two folders: <em>lib</em> and <em>sample-app-capitals</em>. First one is a library project that you should add to your project.
-You don&#39;t need any additional permissions in your AndroidManifest.xml to use API library, so you can write real code straight away, calling for different <code>MapsWithMeApi</code> methods (more details below). </p>
-
-<h2>Classes Overview and HOW TO</h2>
-
-<p>Core classes you will work with are:</p>
-
-<ul>
-<li><a href="lib/src/com/mapswithme/maps/api/MapsWithMeApi.java" title="MapsWithMeApi.java">com.mapswithme.maps.api.MapsWithMeApi</a> - static class with methods such as <code>showPointOnMap(Activity, double, double, String)</code> etc.</li>
-<li><a href="lib/src/com/mapswithme/maps/api/MWMPoint.java" title="MWMPoint.java">com.mapswithme.maps.api.MWMPoint</a> - model of POI, includes lat, lon, name, and id data.</li>
-<li><a href="lib/src/com/mapswithme/maps/api/MWMResponse.java" title="MWMResponse.java">com.mapswithme.maps.api.MWMResponse</a> - helps you to extract response from MapsWithMe by applying <code>MWMResponse.extractFromIntent(Intent)</code> to Intent. Contains MWMPoint data.</li>
-</ul>
-
-<h3>Show Points on the Map</h3>
-
-<p>The simplest usage:</p>
-
-<pre><code>public class MyPerfectActivity extends Activity {
-...
-
- void showSomethingOnTheMap(SomeDomainObject arg)
- {
- // Do some work, create lat, lon, and name for point
- final double lat = ...;
- final double lon = ...;
- final String name = ...;
- // Ask MapsWithMe to show the point
- MapsWithMeApi.showPointOnMap(this, lat, lon, name);
- }
-...
-
-}
-</code></pre>
-
-<p>For multiple points use <a href="lib/src/com/mapswithme/maps/api/MWMPoint.java" title="MWMPoint.java">MWMPoint</a> class:</p>
-
-<pre><code>void showMultiplePoints(List&lt;SomeDomainObject&gt; list)
-{
- // Convert objects to MMWPoints
- final MWMPoint[] points = new MWMPoint[list.length];
- for (int i = 0; i &lt; list.size; i++)
- {
- // Get lat, lon, and name from object and assign it to new MMWPoint
- points[i] = new MWMPoint(lat, lon, name);
- }
- // Show all point on the map, you could also provide some title
- MapsWithMeApi.showPointsOnMap(this, &quot;Look at my points, my points are amazing!&quot;, points);
-}
-</code></pre>
-
-<h3>Ask MapsWithMe to Call my App</h3>
-
-<p>We support PendingIntent interaction (just like Android native
-NotificationManager does). You should specify ID for each point to
-distinguish it later, and PentingIntent that MapsWithMe will send back to
-your application when user press &quot;More Info&quot; button :</p>
-
-<pre><code>// Here is how to pass points with ID ant PendingIntent
-void showMultiplePointsWithPendingIntent(List&lt;SomeDomainObject&gt; list, PendingIntent pendingIntent)
-{
- // Convert objects to MMWPoints
- final MWMPoint[] points = new MWMPoint[list.length];
- for (int i = 0; i &lt; list.size; i++)
- {
- // ||
- // ||
- // \/
- // Now you should specify string ID for each point
- points[i] = new MWMPoint(lat, lon, name, id);
- }
- // Show all points on the map, you could also provide some title
- MapsWithMeApi.showPointsOnMap(this, &quot;This title says that user should choose some point&quot;, pendingIntent, points);
-}
-
-//Code below shows general way to extract response data
-@Override
-protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- // Handle intent you specified with PandingIntent
- // Now it has additional information (MWMPoint).
- handleIntent(getIntent());
-}
-
-@Override
-protected void onNewIntent(Intent intent)
-{
- super.onNewIntent(intent);
- // if defined your activity as &quot;SingleTop&quot;- you should use onNewIntent callback
- handleIntent(intent);
-}
-
-void handleIntent(Intent intent)
-{
- // Apply MWMResponse extraction method to intent
- final MWMResponse mwmResponse = MWMResponse.extractFromIntent(this, intent);
- // Here is your point that user selected
- final MWMPoint point = mwmResponse.getPoint();
- // Now, for instance you can do some work depending on point id
- processUserInteraction(point.getId());
-}
-</code></pre>
-
-<h2>FAQ</h2>
-
-<h4>How should I detect if user has MapsWithMe installed?</h4>
-
-<p><code>MapsWithMeApi.isMapsWithMeInstalled(Context)</code> will return <code>true</code> if user has <em>Lite</em> or <em>Pro</em> version that supports API call installed.</p>
-
-<h4>Which versions of MapsWithMe support API calls?</h4>
-
-<p>Both <em>Lite</em> and <em>Pro</em> versions since 2.4.0 are support API calls.</p>
-
-<h4>What will happen if I call for <code>MapsWithMeApi.showPoint()</code> but MapsWithMe application is not installed?</h4>
-
-<p>Nothing serious. API library will show simple dialog with gentle offer to download MapsWithMe. You can see how it looks like below. <img src="site/images/dlg.png" alt="Please install us"></p>
-
-<h4>If user has both <em>Lite</em> and <em>Pro</em> versions which one will be called?</h4>
-
-<p>MapsWithMe Pro will serve your request in the case if both <em>Lite</em> and <em>Pro</em> versions installed. </p>
-
-<h2>Sample Code and Application</h2>
-
-<ul>
-<li><a href="http://example.com" title="Api Demo .apk">Sample Application at Google Play</a></li>
-<li><a href="sample-app-capitals" title="Api Source Code">Sample Application Source Code</a></li>
-</ul>
-
-<h2>Support</h2>
-
-<p>If you have any questions please email to <a href="mailto:api@mapswith.me" title="MapsWithMe Support Contact">api@mapswith.me</a>.</p>
-
-<hr>
-
-<h2>API Code License</h2>
-
-<p>Copyright (c) 2013, MapsWithMe GmbH
-All rights reserved.</p>
-
-<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
-
-<ul>
-<li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li>
-<li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</li>
-</ul>
-
-<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
diff --git a/api/android/README.md b/api/android/README.md
deleted file mode 100644
index 5bd9f60a38..0000000000
--- a/api/android/README.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# MapsWithMe Android API: Getting Started
-
-## Introduction
-MapsWithMe Android API (hereinafter referred to as *"API Library"* or just *"library"*)
-provides interface for client application to perform next tasks:
-
-* Show one or more points on offline map of [MapsWithMe Application][linkMwm]
-* Come back to the client application after selecting specific point on the map, by sending [PendingIntent][linkPIntent] with point data when user asks for more information by pressing "More Info" button in MapsWithMe Application
-* Map screen branding : your application's icon and name (or custom title) will be placed at the top.
-
-Thus, you can provide **two way communication between your application and MapsWithMe**,
-using MapsWithMe to show points of interest (POI) and providing more information in your app.
-
-Please refer to [sample application][linkSampleSource] for demo.
-
-## Prerequisites
-
-It is supposed that you are familiar with Android Development, and you have Android SDK and Eclipse (or another IDE of your choice) installed.
-You should be familiar with concept of [Intents][linkIntents], [library projects][linkLibProj], and [PendingIntents][linkPIntent] (recommended) as well.
-Your application must target at least *android sdk version 7*.
-
-## Integration
-First step is to clone [repository][linkRepo] or download it as an archive.
-
-When your are done you find two folders: *lib* and *sample-app-capitals*. First one is a library project that you should add to your project.
-You don't need any additional permissions in your AndroidManifest.xml to use API library, so you can write real code straight away, calling for different `MapsWithMeApi` methods (more details below).
-
-##Classes Overview and HOW TO
-Core classes you will work with are:
-
-* [com.mapswithme.maps.api.MapsWithMeApi][linkApiClass] - static class with methods such as `showPointOnMap(Activity, double, double, String)` etc.
-* [com.mapswithme.maps.api.MWMPoint][linkPointClass] - model of POI, includes lat, lon, name, and id data.
-* [com.mapswithme.maps.api.MWMResponse][linkRespClass] - helps you to extract response from MapsWithMe by applying `MWMResponse.extractFromIntent(Intent)` to Intent. Contains MWMPoint data.
-
-### Show Points on the Map
-
-The simplest usage:
-
- public class MyPerfectActivity extends Activity {
- ...
-
- void showSomethingOnTheMap(SomeDomainObject arg)
- {
- // Do some work, create lat, lon, and name for point
- final double lat = ...;
- final double lon = ...;
- final String name = ...;
- // Ask MapsWithMe to show the point
- MapsWithMeApi.showPointOnMap(this, lat, lon, name);
- }
- ...
-
- }
-
-For multiple points use [MWMPoint][linkPointClass] class:
-
- void showMultiplePoints(List<SomeDomainObject> list)
- {
- // Convert objects to MMWPoints
- final MWMPoint[] points = new MWMPoint[list.length];
- for (int i = 0; i < list.size; i++)
- {
- // Get lat, lon, and name from object and assign it to new MMWPoint
- points[i] = new MWMPoint(lat, lon, name);
- }
- // Show all point on the map, you could also provide some title
- MapsWithMeApi.showPointsOnMap(this, "Look at my points, my points are amazing!", points);
- }
-
-
-### Ask MapsWithMe to Call my App
-
-We support PendingIntent interaction (just like Android native
-NotificationManager does). You should specify ID for each point to
-distinguish it later, and PentingIntent that MapsWithMe will send back to
-your application when user press "More Info" button :
-
- // Here is how to pass points with ID ant PendingIntent
- void showMultiplePointsWithPendingIntent(List<SomeDomainObject> list, PendingIntent pendingIntent)
- {
- // Convert objects to MMWPoints
- final MWMPoint[] points = new MWMPoint[list.length];
- for (int i = 0; i < list.size; i++)
- {
- // ||
- // ||
- // \/
- // Now you should specify string ID for each point
- points[i] = new MWMPoint(lat, lon, name, id);
- }
- // Show all points on the map, you could also provide some title
- MapsWithMeApi.showPointsOnMap(this, "This title says that user should choose some point", pendingIntent, points);
- }
-
- //Code below shows general way to extract response data
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- // Handle intent you specified with PandingIntent
- // Now it has additional information (MWMPoint).
- handleIntent(getIntent());
- }
-
- @Override
- protected void onNewIntent(Intent intent)
- {
- super.onNewIntent(intent);
- // if defined your activity as "SingleTop"- you should use onNewIntent callback
- handleIntent(intent);
- }
-
- void handleIntent(Intent intent)
- {
- // Apply MWMResponse extraction method to intent
- final MWMResponse mwmResponse = MWMResponse.extractFromIntent(this, intent);
- // Here is your point that user selected
- final MWMPoint point = mwmResponse.getPoint();
- // Now, for instance you can do some work depending on point id
- processUserInteraction(point.getId());
- }
-
-## FAQ
-
-#### How should I detect if user has MapsWithMe installed?
-`MapsWithMeApi.isMapsWithMeInstalled(Context)` will return `true` if user has *Lite* or *Pro* version that supports API call installed.
-
-#### Which versions of MapsWithMe support API calls?
-Both *Lite* and *Pro* versions since 2.4.0 are support API calls.
-
-#### What will happen if I call for `MapsWithMeApi.showPoint()` but MapsWithMe application is not installed?
-Nothing serious. API library will show simple dialog with gentle offer to download MapsWithMe. You can see how it looks like below. ![Please install us](site/images/dlg.png)
-
-#### If user has both *Lite* and *Pro* versions which one will be called?
-MapsWithMe Pro will serve your request in the case if both *Lite* and *Pro* versions installed.
-
-## Sample Code and Application
-
-* [Sample Application at Google Play][linkSampleGooglePlay]
-* [Sample Application Source Code][linkSampleSource]
-
-## Support
-If you have any questions please email to [api@mapswith.me][linkSupport].
-
--------------------------------------------------------------------------------
-## API Code License
-Copyright (c) 2013, MapsWithMe GmbH
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[linkMwm]: http://mapswith.me/ "MapsWithMe"
-[linkPIntent]: http://developer.android.com/reference/android/app/PendingIntent.html "PendingIntent"
-[linkRepo]: https://github.com/mapswithme/api-android "GitHub Repository"
-[linkLibProj]: http://developer.android.com/tools/projects/index.html#LibraryProjects "Android Library Project"
-[linkIntents]: http://developer.android.com/guide/components/intents-filters.html "Intents and Intent Filters"
-[linkSupport]: mailto:api@mapswith.me "MapsWithMe Support Contact"
-[linkApiClass]: lib/src/com/mapswithme/maps/api/MapsWithMeApi.java "MapsWithMeApi.java"
-[linkPointClass]: lib/src/com/mapswithme/maps/api/MWMPoint.java "MWMPoint.java"
-[linkRespClass]: lib/src/com/mapswithme/maps/api/MWMResponse.java "MWMResponse.java"
-[linkSampleSource]: sample-app-capitals "Api Source Code"
-[linkSampleGooglePlay]: http://example.com "Api Demo .apk"
diff --git a/api/android/lib/AndroidManifest.xml b/api/android/lib/AndroidManifest.xml
deleted file mode 100644
index ed54f28c03..0000000000
--- a/api/android/lib/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.mapwithme.maps.api"
- android:versionCode="1"
- android:versionName="1.0" >
-</manifest> \ No newline at end of file
diff --git a/api/android/lib/build.xml b/api/android/lib/build.xml
deleted file mode 100644
index dbb259504a..0000000000
--- a/api/android/lib/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="MwmApi" default="help">
-
- <!-- The local.properties file is created and updated by the 'android' tool.
- It contains the path to the SDK. It should *NOT* be checked into
- Version Control Systems. -->
- <property file="local.properties" />
-
- <!-- The ant.properties file can be created by you. It is only edited by the
- 'android' tool to add properties to it.
- This is the place to change some Ant specific build properties.
- Here are some properties you may want to change/update:
-
- source.dir
- The name of the source directory. Default is 'src'.
- out.dir
- The name of the output directory. Default is 'bin'.
-
- For other overridable properties, look at the beginning of the rules
- files in the SDK, at tools/ant/build.xml
-
- Properties related to the SDK location or the project target should
- be updated using the 'android' tool with the 'update' action.
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems.
-
- -->
- <property file="ant.properties" />
-
- <!-- if sdk.dir was not set from one of the property file, then
- get it from the ANDROID_HOME env var.
- This must be done before we load project.properties since
- the proguard config can use sdk.dir -->
- <property environment="env" />
- <condition property="sdk.dir" value="${env.ANDROID_HOME}">
- <isset property="env.ANDROID_HOME" />
- </condition>
-
- <!-- The project.properties file is created and updated by the 'android'
- tool, as well as ADT.
-
- This contains project specific properties such as project target, and library
- dependencies. Lower level build properties are stored in ant.properties
- (or in .classpath for Eclipse projects).
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems. -->
- <loadproperties srcFile="project.properties" />
-
- <!-- quick check on sdk.dir -->
- <fail
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
- unless="sdk.dir"
- />
-
- <!--
- Import per project custom build rules if present at the root of the project.
- This is the place to put custom intermediary targets such as:
- -pre-build
- -pre-compile
- -post-compile (This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir})
- -post-package
- -post-build
- -pre-clean
- -->
- <import file="custom_rules.xml" optional="true" />
-
- <!-- Import the actual build file.
-
- To customize existing targets, there are two options:
- - Customize only one target:
- - copy/paste the target into this file, *before* the
- <import> task.
- - customize it to your needs.
- - Customize the whole content of build.xml
- - copy/paste the content of the rules files (minus the top node)
- into this file, replacing the <import> task.
- - customize to your needs.
-
- ***********************
- ****** IMPORTANT ******
- ***********************
- In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
- in order to avoid having your file be overridden by tools such as "android update project"
- -->
- <!-- version-tag: 1 -->
- <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/api/android/lib/proguard-project.txt b/api/android/lib/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/api/android/lib/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/api/android/lib/project.properties b/api/android/lib/project.properties
deleted file mode 100644
index 484dab0753..0000000000
--- a/api/android/lib/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
-android.library=true
diff --git a/api/android/lib/res/drawable/background_pattern.xml b/api/android/lib/res/drawable/background_pattern.xml
deleted file mode 100644
index 2293a5123b..0000000000
--- a/api/android/lib/res/drawable/background_pattern.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:dither="true"
- android:src="@drawable/pattern"
- android:tileMode="repeat" />
diff --git a/api/android/lib/res/drawable/btn_back_gray.xml b/api/android/lib/res/drawable/btn_back_gray.xml
deleted file mode 100644
index 445902c519..0000000000
--- a/api/android/lib/res/drawable/btn_back_gray.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <!-- "background shadow" -->
- <item android:drawable="@drawable/shadow"/>
- <item
- android:bottom="1dp"
- android:left="1dp"
- android:right="1dp"
- android:top="1dp"
- android:drawable="@drawable/gray"/>
-
-</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_gray_active.xml b/api/android/lib/res/drawable/btn_back_gray_active.xml
deleted file mode 100644
index a4d6310133..0000000000
--- a/api/android/lib/res/drawable/btn_back_gray_active.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
- <!-- "background shadow" -->
- <item android:drawable="@drawable/shadow"/>
-
- <item
- android:bottom="2dp"
- android:left="1dp"
- android:right="1dp"
- android:top="1dp"
- android:drawable="@drawable/gray"/>
-
- <item android:drawable="@drawable/overflow"/>
-
-</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green.xml b/api/android/lib/res/drawable/btn_back_green.xml
deleted file mode 100644
index b64755185b..0000000000
--- a/api/android/lib/res/drawable/btn_back_green.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <!-- "background shadow" -->
- <item android:drawable="@drawable/shadow"/>
-
- <item
- android:bottom="1dp"
- android:left="1dp"
- android:right="1dp"
- android:top="1dp"
- android:drawable="@drawable/green"/>
-
-</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_back_green_active.xml b/api/android/lib/res/drawable/btn_back_green_active.xml
deleted file mode 100644
index 49e849f8e4..0000000000
--- a/api/android/lib/res/drawable/btn_back_green_active.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <!-- "background shadow" -->
- <item android:drawable="@drawable/shadow"/>
-
- <item
- android:bottom="2dp"
- android:left="1dp"
- android:right="1dp"
- android:top="1dp"
- android:drawable="@drawable/green"/>
-
- <item android:drawable="@drawable/overflow"/>
-
-</layer-list> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_gray_selector.xml b/api/android/lib/res/drawable/btn_gray_selector.xml
deleted file mode 100644
index 3876bb0761..0000000000
--- a/api/android/lib/res/drawable/btn_gray_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/btn_back_gray_active" android:state_pressed="true"/>
- <item android:drawable="@drawable/btn_back_gray"/>
-
-</selector> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/btn_green_selector.xml b/api/android/lib/res/drawable/btn_green_selector.xml
deleted file mode 100644
index 61b78df322..0000000000
--- a/api/android/lib/res/drawable/btn_green_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/btn_back_green_active" android:state_pressed="true"/>
- <item android:drawable="@drawable/btn_back_green"/>
-
-</selector> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/gray.xml b/api/android/lib/res/drawable/gray.xml
deleted file mode 100644
index f3fda93007..0000000000
--- a/api/android/lib/res/drawable/gray.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
-
-
- <gradient android:type="linear"
- android:angle="90"
- android:startColor="#D00099CC"
- android:centerColor="#D033B5E5"
- android:endColor="#D00099CC"/>
-
- <corners android:radius="4dp" />
-</shape> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/green.xml b/api/android/lib/res/drawable/green.xml
deleted file mode 100644
index c7afb64a8a..0000000000
--- a/api/android/lib/res/drawable/green.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
- <!--
- <solid android:color="#66CC33" /> -->
-
- <gradient android:type="linear"
- android:angle="90"
- android:startColor="#D066CC33"
- android:centerColor="#D099CC00"
- android:endColor="#D066CC33"/>
-
-
- <corners android:radius="4dp" />
-</shape> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/overflow.xml b/api/android/lib/res/drawable/overflow.xml
deleted file mode 100644
index f507765b17..0000000000
--- a/api/android/lib/res/drawable/overflow.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
- <solid android:color="#80FFFFFF" />
- <corners android:radius="3dp" />
-</shape> \ No newline at end of file
diff --git a/api/android/lib/res/drawable/pattern.png b/api/android/lib/res/drawable/pattern.png
deleted file mode 100644
index 33b8d96389..0000000000
--- a/api/android/lib/res/drawable/pattern.png
+++ /dev/null
Binary files differ
diff --git a/api/android/lib/res/drawable/shadow.xml b/api/android/lib/res/drawable/shadow.xml
deleted file mode 100644
index 4c241c4cf3..0000000000
--- a/api/android/lib/res/drawable/shadow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
- <gradient
- android:angle="-90"
- android:centerX="50%"
- android:centerY="50%"
- android:gradientRadius="400"
- android:startColor="#44000000"
- android:endColor="#88000000"
- android:type="linear" />
- <corners android:radius="4dp" />
-</shape> \ No newline at end of file
diff --git a/api/android/lib/res/layout/dlg_install_mwm.xml b/api/android/lib/res/layout/dlg_install_mwm.xml
deleted file mode 100644
index a074d57910..0000000000
--- a/api/android/lib/res/layout/dlg_install_mwm.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/background_pattern"
- android:gravity="center"
- android:orientation="vertical"
- android:paddingLeft="10dp"
- android:paddingRight="10dp" >
-
- <TextView
- style="@android:style/TextAppearance.Medium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:layout_weight="0"
- android:gravity="center"
- android:text="@string/mwm_should_be_installed"
- android:textColor="@android:color/black"/>
-
- <Button
- android:id="@+id/btn_lite"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginBottom="10dp"
- android:layout_marginTop="10dp"
- android:layout_weight="1"
- android:background="@drawable/btn_gray_selector"
- android:padding="6dp"
- android:text="@string/down_lite"
- android:textColor="@android:color/white"
- android:textStyle="bold" />
-
- <Button
- android:id="@+id/btn_pro"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="10dp"
- android:layout_marginBottom="10dp"
- android:layout_weight="1"
- android:background="@drawable/btn_green_selector"
- android:padding="6dp"
- android:text="@string/down_pro"
- android:textColor="@android:color/white"
- android:textStyle="bold"/>
- </LinearLayout>
-
-</ScrollView> \ No newline at end of file
diff --git a/api/android/lib/res/values/strings.xml b/api/android/lib/res/values/strings.xml
deleted file mode 100644
index 28490843cb..0000000000
--- a/api/android/lib/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="mwm_should_be_installed"><b><font fgcolor="#FF66CC33">MapsWithMe</font></b> app should be installed to view the map.</string>
- <string name="down_lite">Download MapsWithMe Lite (free)</string>
- <string name="down_pro">Download MapsWithMe Pro</string>
-
- <string name="url_pro">http://mapswith.me/api_pro</string>
- <string name="url_lite">http://mapswith.me/api_lite</string>
-</resources> \ No newline at end of file
diff --git a/api/android/lib/src/com/mapswithme/maps/api/Const.java b/api/android/lib/src/com/mapswithme/maps/api/Const.java
deleted file mode 100644
index 4f6664c405..0000000000
--- a/api/android/lib/src/com/mapswithme/maps/api/Const.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.maps.api;
-
-public class Const
-{
-
- /* Request extras */
- static final String AUTHORITY = "com.mapswithme.maps.api";
- public static final String EXTRA_URL = AUTHORITY + ".url";
- public static final String EXTRA_TITLE = AUTHORITY + ".title";
- public static final String EXTRA_API_VERSION = AUTHORITY + ".version";
- public static final String EXTRA_CALLER_APP_INFO = AUTHORITY + ".caller_app_info";
- public static final String EXTRA_HAS_PENDING_INTENT = AUTHORITY + ".has_pen_intent";
- public static final String EXTRA_CALLER_PENDING_INTENT = AUTHORITY + ".pending_intent";
-
-
- /* Response extras */
- /* Point part-by-part*/
- public static final String EXTRA_MWM_RESPONSE_POINT_NAME = AUTHORITY + ".point_name";
- public static final String EXTRA_MWM_RESPONSE_POINT_LAT = AUTHORITY + ".point_lat";
- public static final String EXTRA_MWM_RESPONSE_POINT_LON = AUTHORITY + ".point_lon";
- public static final String EXTRA_MWM_RESPONSE_POINT_ID = AUTHORITY + ".point_id";
-
-
- public static final String ACTION_MWM_REQUEST = AUTHORITY + ".request";
- static final int API_VERSION = 1;
- static final String CALLBACK_PREFIX = "mapswithme.client.";
-
- private Const() {}
-}
diff --git a/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java b/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
deleted file mode 100644
index 5670a5f828..0000000000
--- a/api/android/lib/src/com/mapswithme/maps/api/DownloadMapsWithMeDialog.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.maps.api;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.view.View;
-import android.view.Window;
-
-import com.mapwithme.maps.api.R;
-
-public class DownloadMapsWithMeDialog extends Dialog implements android.view.View.OnClickListener
-{
-
- public DownloadMapsWithMeDialog(Activity activity)
- {
- super(activity);
-
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- setContentView(R.layout.dlg_install_mwm);
-
- findViewById(R.id.btn_lite).setOnClickListener(this);
- findViewById(R.id.btn_pro).setOnClickListener(this);
-
- setOwnerActivity(activity);
- }
-
-
- public void onDownloadButtonClicked(String url)
- {
- Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
- getContext().startActivity(i);
- dismiss();
- }
-
-
- @Override
- public void onClick(View v)
- {
- String url = getContext().getString(v.getId() == R.id.btn_lite ? R.string.url_lite : R.string.url_pro);
- onDownloadButtonClicked(url);
- }
-}
diff --git a/api/android/lib/src/com/mapswithme/maps/api/MWMPoint.java b/api/android/lib/src/com/mapswithme/maps/api/MWMPoint.java
deleted file mode 100644
index 86fa39a291..0000000000
--- a/api/android/lib/src/com/mapswithme/maps/api/MWMPoint.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.maps.api;
-
-import java.io.Serializable;
-
-/**
- * POI wrapper object.
- * Has it's <code>equals()</code> and <code>hashCode()</code> methods overloaded
- * so could be used in Hash(Map/Set/etc) classes.
- */
-public final class MWMPoint implements Serializable
-{
- private static final long serialVersionUID = 1L;
-
- final private double mLat;
- final private double mLon;
- final private String mName;
- private String mId;
-
- public MWMPoint(double lat, double lon, String name)
- {
- this(lat, lon, name, null);
- }
-
- public MWMPoint(double lat, double lon, String name, String id)
- {
- this.mLat = lat;
- this.mLon = lon;
- this.mName = name;
- this.mId = id;
- }
-
- public double getLat() { return mLat; }
- public double getLon() { return mLon; }
- public String getName() { return mName; }
- public String getId() { return mId; }
-
- /**
- * Sets string ID for this point. Internally it is not used to distinguish point,
- * it's purpose to help clients code to associate point with domain objects of their application.
- * @param id
- */
- public void setId(String id) { mId = id; }
-
- @Override
- public String toString()
- {
- return "MWMPoint [lat=" + mLat + ", lon=" + mLon + ", name=" + mName + ", id=" + mId + "]";
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- long temp;
- temp = Double.doubleToLongBits(mLat);
- result = prime * result + (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(mLon);
- result = prime * result + (int) (temp ^ (temp >>> 32));
- result = prime * result + ((mName == null) ? 0 : mName.hashCode());
- return result;
- }
-
- /**
- * Two point are considered
- * equal if they have they lat, lon, and name attributes equal.
- */
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- final MWMPoint other = (MWMPoint) obj;
- if (Double.doubleToLongBits(mLat) != Double.doubleToLongBits(other.mLat))
- return false;
- if (Double.doubleToLongBits(mLon) != Double.doubleToLongBits(other.mLon))
- return false;
-
- return mName == null ? other.mName == null : mName.equals(other.mName);
- }
-}
diff --git a/api/android/lib/src/com/mapswithme/maps/api/MWMResponse.java b/api/android/lib/src/com/mapswithme/maps/api/MWMResponse.java
deleted file mode 100644
index d6cefdc2a9..0000000000
--- a/api/android/lib/src/com/mapswithme/maps/api/MWMResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.maps.api;
-
-import android.content.Context;
-import android.content.Intent;
-
-public class MWMResponse
-{
- private MWMPoint mPoint;
-
- /**
- *
- * @return point, for which user requested more information in MapsWithMe application.
- */
- public MWMPoint getPoint() { return mPoint; }
- public boolean hasPoint() { return mPoint != null; }
-
- @Override
- public String toString()
- {
- return "MWMResponse [SelectedPoint=" + mPoint + "]";
- }
-
- /**
- * Factory method to extract response data from intent.
- *
- * @param context
- * @param intent
- * @return
- */
- public static MWMResponse extractFromIntent(Context context, Intent intent)
- {
- final MWMResponse response = new MWMResponse();
- // parse status
- // parse point
- final double lat = intent.getDoubleExtra(Const.EXTRA_MWM_RESPONSE_POINT_LAT, 0);
- final double lon = intent.getDoubleExtra(Const.EXTRA_MWM_RESPONSE_POINT_LON, 0);
- final String name = intent.getStringExtra(Const.EXTRA_MWM_RESPONSE_POINT_NAME);
- final String id = intent.getStringExtra(Const.EXTRA_MWM_RESPONSE_POINT_ID);
- response.mPoint = new MWMPoint(lat, lon, name, id);
-
- return response;
- }
-
- private MWMResponse() {}
-}
diff --git a/api/android/lib/src/com/mapswithme/maps/api/MapsWithMeApi.java b/api/android/lib/src/com/mapswithme/maps/api/MapsWithMeApi.java
deleted file mode 100644
index 615fbbbbc1..0000000000
--- a/api/android/lib/src/com/mapswithme/maps/api/MapsWithMeApi.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.maps.api;
-
-import java.util.Locale;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.net.Uri;
-public final class MapsWithMeApi
-{
-
- /**
- * Most detailed level, buildings and trees are seen.
- */
- public static final double ZOOM_MAX = 19;
- /**
- * Least detailed level, continents are seen.
- */
- public static final double ZOOM_MIN = 1;
-
-
- /**
- * Shows single point on the map.
- *
- * @param caller
- * @param lat
- * @param lon
- * @param name
- */
- public static void showPointOnMap(Activity caller, double lat, double lon, String name)
- {
- showPointsOnMap(caller, (String)null, (PendingIntent)null, new MWMPoint(lat, lon, name));
- }
-
-
- /**
- * Shows single point on the map using specified
- * zoom level in range from {@link MapsWithMeApi#ZOOM_MIN} to {@link MapsWithMeApi#ZOOM_MAX}.
- *
- * @param caller
- * @param lat
- * @param lon
- * @param name
- * @param zoomLevel
- */
- public static void showPointOnMap(Activity caller, double lat, double lon, String name, double zoomLevel)
- {
- showPointsOnMap(caller, (String)null, zoomLevel, (PendingIntent)null, new MWMPoint(lat, lon, name));
- }
-
- /**
- * Shows set of points on the map.
- *
- * @param caller
- * @param title
- * @param points
- */
- public static void showPointsOnMap(Activity caller, String title, MWMPoint... points)
- {
- showPointsOnMap(caller, title, null, points);
- }
-
- /**
- * Shows set of points on the maps
- * and allows MapsWithMeApplication to send {@link PendingIntent} provided by client application.
- *
- * @param caller
- * @param title
- * @param pendingIntent
- * @param points
- */
- public static void showPointsOnMap(Activity caller, String title, PendingIntent pendingIntent, MWMPoint ... points)
- {
- showPointsOnMap(caller, title, -1, pendingIntent, points);
- }
-
- /**
- * Detects if any version (Lite, Pro) of MapsWithMe, which supports
- * API calls are installed on the device.
- *
- * @param context
- * @return
- */
- public static boolean isMapsWithMeInstalled(Context context)
- {
- final Intent intent = new Intent(Const.ACTION_MWM_REQUEST);
- return context.getPackageManager().resolveActivity(intent, 0) != null;
- }
-
- // Internal only code
-
- private static void showPointsOnMap(Activity caller, String title, double zoomLevel, PendingIntent pendingIntent, MWMPoint... points)
- {
- final Intent mwmIntent = new Intent(Const.ACTION_MWM_REQUEST);
-
- mwmIntent.putExtra(Const.EXTRA_URL, createMwmUrl(caller, title, zoomLevel, points).toString());
- mwmIntent.putExtra(Const.EXTRA_TITLE, title);
-
- final boolean hasIntent = pendingIntent != null;
- mwmIntent.putExtra(Const.EXTRA_HAS_PENDING_INTENT, hasIntent);
- if (hasIntent)
- mwmIntent.putExtra(Const.EXTRA_CALLER_PENDING_INTENT, pendingIntent);
-
- addCommonExtras(caller, mwmIntent);
-
- if (isMapsWithMeInstalled(caller))
- {
- // Match activity for intent
- final ActivityInfo aInfo = caller.getPackageManager().resolveActivity(mwmIntent, 0).activityInfo;
- mwmIntent.setClassName(aInfo.packageName, aInfo.name);
- caller.startActivity(mwmIntent);
- }
- else
- (new DownloadMapsWithMeDialog(caller)).show();
- }
-
- static StringBuilder createMwmUrl(Context context, String title, double zoomLevel, MWMPoint ... points)
- {
- StringBuilder urlBuilder = new StringBuilder("mapswithme://map?");
- // version
- urlBuilder.append("v=")
- .append(Const.API_VERSION)
- .append("&");
- // back url, always not null
- urlBuilder.append("backurl=")
- .append(getCallbackAction(context))
- .append("&");
- // title
- appendIfNotNull(urlBuilder, "appname", title);
- // zoom
- appendIfNotNull(urlBuilder, "z", isValidZoomLevel(zoomLevel) ? String.valueOf(zoomLevel) : null);
-
- // points
- for (MWMPoint point : points)
- {
- if (point != null)
- {
- urlBuilder.append("ll=")
- .append(String.format(Locale.US, "%f,%f&", point.getLat(), point.getLon()));
-
- appendIfNotNull(urlBuilder, "n", point.getName());
- appendIfNotNull(urlBuilder, "id", point.getId());
- }
- }
-
- return urlBuilder;
- }
-
- static String getCallbackAction(Context context)
- {
- return Const.CALLBACK_PREFIX + context.getPackageName();
- }
-
- @SuppressLint("NewApi")
- private static Intent addCommonExtras(Context context, Intent intent)
- {
- intent.putExtra(Const.EXTRA_CALLER_APP_INFO, context.getApplicationInfo());
- intent.putExtra(Const.EXTRA_API_VERSION, Const.API_VERSION);
-
- return intent;
- }
-
- private static StringBuilder appendIfNotNull(StringBuilder builder, String key, String value)
- {
- if (value != null)
- builder.append(key)
- .append("=")
- .append(Uri.encode(value))
- .append("&");
-
- return builder;
- }
-
- private static boolean isValidZoomLevel(double zoom)
- {
- return zoom >= ZOOM_MIN && zoom <= ZOOM_MAX;
- }
-}
diff --git a/api/android/readme_to_html.sh b/api/android/readme_to_html.sh
deleted file mode 100755
index 8754fc4357..0000000000
--- a/api/android/readme_to_html.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e -u -x
-
-## This script converts .md file to .html and opens it in browser.
-## Please install next gems to use it:
-## gem install redcarpet
-## gem install github-markup
-
-github-markup README.md > README.html
-open README.html \ No newline at end of file
diff --git a/api/android/sample-app-capitals/AndroidManifest.xml b/api/android/sample-app-capitals/AndroidManifest.xml
deleted file mode 100644
index e71f9af806..0000000000
--- a/api/android/sample-app-capitals/AndroidManifest.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.mapswithme.capitals"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk
- android:minSdkVersion="7"
- android:targetSdkVersion="17" />
-
- <application
- android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme" >
-
- <activity
- android:name="com.mapswithme.capitals.CapitalsListActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <activity
- android:name="com.mapswithme.capitals.CityDetailsActivity"
- android:label="@string/app_name" >
- android:launchMode="singleTop" >
- </activity>
-
- </application>
-
-</manifest> \ No newline at end of file
diff --git a/api/android/sample-app-capitals/project.properties b/api/android/sample-app-capitals/project.properties
deleted file mode 100644
index 333fa1052b..0000000000
--- a/api/android/sample-app-capitals/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
-android.library.reference.1=../lib
diff --git a/api/android/sample-app-capitals/res/drawable-hdpi/ic_launcher.png b/api/android/sample-app-capitals/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 9e67a44a61..0000000000
--- a/api/android/sample-app-capitals/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/api/android/sample-app-capitals/res/drawable-ldpi/ic_launcher.png b/api/android/sample-app-capitals/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1e322e6bed..0000000000
--- a/api/android/sample-app-capitals/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/api/android/sample-app-capitals/res/drawable-mdpi/ic_launcher.png b/api/android/sample-app-capitals/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 0555b554b5..0000000000
--- a/api/android/sample-app-capitals/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/api/android/sample-app-capitals/res/drawable-xhdpi/ic_launcher.png b/api/android/sample-app-capitals/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 35085961dd..0000000000
--- a/api/android/sample-app-capitals/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/api/android/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.png b/api/android/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 1520f13b53..0000000000
--- a/api/android/sample-app-capitals/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/api/android/sample-app-capitals/res/layout/capitals_list_activity.xml b/api/android/sample-app-capitals/res/layout/capitals_list_activity.xml
deleted file mode 100644
index 95f548061c..0000000000
--- a/api/android/sample-app-capitals/res/layout/capitals_list_activity.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:orientation="vertical"
- tools:context=".CapitalsListActivity" >
-
- <ListView
- android:id="@android:id/list"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:layout_width="match_parent"/>
-
- <Button
- android:id="@+id/btn_all"
- android:layout_weight="0"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/show_all"
- android:drawableLeft="@drawable/ic_launcher"/>
-
-</LinearLayout>
diff --git a/api/android/sample-app-capitals/res/layout/city_details_activity.xml b/api/android/sample-app-capitals/res/layout/city_details_activity.xml
deleted file mode 100644
index a54dcaf904..0000000000
--- a/api/android/sample-app-capitals/res/layout/city_details_activity.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<!--
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- tools:context=".CityDetailsActivity" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <Button
- android:id="@+id/showOnMap"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:drawableLeft="@drawable/ic_launcher"
- android:text="@string/open_with_mapswithme" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/name" />
-
- <TextView
- android:id="@+id/name"
- style="@android:style/TextAppearance.Large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin" >
-
- <TextView
- android:id="@+id/latHook"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:text="@string/lat" />
-
- <TextView
- android:id="@+id/lat"
- style="@android:style/TextAppearance.Large"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/latHook" />
-
- <TextView
- android:id="@+id/lonHook"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:text="@string/lon" />
-
- <TextView
- android:id="@+id/lon"
- style="@android:style/TextAppearance.Large"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/lonHook" />
- </RelativeLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/country" />
-
- <TextView
- android:id="@+id/cCode"
- style="@android:style/TextAppearance.Large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/population" />
-
- <TextView
- android:id="@+id/population"
- style="@android:style/TextAppearance.Large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/elevation" />
-
- <TextView
- android:id="@+id/elevation"
- style="@android:style/TextAppearance.Large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/time_zone" />
-
- <TextView
- android:id="@+id/timeZone"
- style="@android:style/TextAppearance.Large"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/detail_block_margin"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/alternative_names" />
-
- <TextView
- android:id="@+id/altNames"
- style="@android:style/TextAppearance.Medium"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
- </LinearLayout>
-
-</ScrollView> \ No newline at end of file
diff --git a/api/android/sample-app-capitals/res/values-sw720dp-land/dimens.xml b/api/android/sample-app-capitals/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 42793fc0ce..0000000000
--- a/api/android/sample-app-capitals/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <dimen name="activity_horizontal_margin">128dp</dimen>
-</resources>
diff --git a/api/android/sample-app-capitals/res/values-v11/styles.xml b/api/android/sample-app-capitals/res/values-v11/styles.xml
deleted file mode 100644
index d88f798260..0000000000
--- a/api/android/sample-app-capitals/res/values-v11/styles.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light" />
-</resources> \ No newline at end of file
diff --git a/api/android/sample-app-capitals/res/values-v14/styles.xml b/api/android/sample-app-capitals/res/values-v14/styles.xml
deleted file mode 100644
index 0fb9691471..0000000000
--- a/api/android/sample-app-capitals/res/values-v14/styles.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar"/>
-</resources>
diff --git a/api/android/sample-app-capitals/res/values/dimens.xml b/api/android/sample-app-capitals/res/values/dimens.xml
deleted file mode 100644
index 7aec8ada65..0000000000
--- a/api/android/sample-app-capitals/res/values/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
- <dimen name="detail_block_margin">8dp</dimen>
-
-</resources>
diff --git a/api/android/sample-app-capitals/res/values/strings.xml b/api/android/sample-app-capitals/res/values/strings.xml
deleted file mode 100644
index c675126f80..0000000000
--- a/api/android/sample-app-capitals/res/values/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">MapsWithMeCapitals</string>
- <string name="show_all">Show All Capitals with MapsWithMe</string>
- <string name="open_with_mapswithme">Open With MapsWithMe</string>
- <string name="name">Name:</string>
- <string name="alternative_names">Alternative names:</string>
- <string name="lat">Lat:</string>
- <string name="lon">Lon:</string>
- <string name="country">Country:</string>
- <string name="population">Population:</string>
- <string name="time_zone">Time Zone:</string>
- <string name="elevation">Elevation:</string>
-
-</resources>
diff --git a/api/android/sample-app-capitals/res/values/styles.xml b/api/android/sample-app-capitals/res/values/styles.xml
deleted file mode 100644
index b8c0d89094..0000000000
--- a/api/android/sample-app-capitals/res/values/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
- <style name="AppBaseTheme" parent="android:Theme.Light"/>
- <style name="AppTheme" parent="AppBaseTheme"/>
-</resources>
diff --git a/api/android/sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java b/api/android/sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java
deleted file mode 100644
index 61b3e3ac8f..0000000000
--- a/api/android/sample-app-capitals/src/com/mapswithme/capitals/CapitalsListActivity.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.capitals;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.mapswithme.maps.api.MWMPoint;
-import com.mapswithme.maps.api.MapsWithMeApi;
-
-public class CapitalsListActivity extends ListActivity
-{
- CityAdapter mCityAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.capitals_list_activity);
-
- mCityAdapter = new CityAdapter(this, City.CAPITALS);
- setListAdapter(mCityAdapter);
-
- findViewById(R.id.btn_all).setOnClickListener(new OnClickListener()
- {
- @Override
- public void onClick(View v) { showCityOnMWMMap(City.CAPITALS); }
- });
- }
-
-
- @Override
- protected void onListItemClick(ListView l, View v, int position, long id)
- {
- showCityOnMWMMap(mCityAdapter.getItem(position));
- }
-
- private void showCityOnMWMMap(City ... cities)
- {
- MWMPoint[] points = new MWMPoint[cities.length];
- for (int i = 0; i < cities.length; i++)
- points[i] = cities[i].toMWMPoint();
-
- final String title = cities.length == 1 ? cities[0].getName() : "Capitals of the World";
- MapsWithMeApi.showPointsOnMap(this, title, CityDetailsActivity.getPendingIntent(this), points);
- }
-
- private static class CityAdapter extends ArrayAdapter<City>
- {
- private final City[] data;
-
- public CityAdapter(Context context, City[] cities)
- {
- super(context, android.R.layout.simple_list_item_2, android.R.id.text1, cities);
- data = cities;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent)
- {
- final View view = super.getView(position, convertView, parent);
- final TextView subText = (TextView) view.findViewById(android.R.id.text2);
- final City city = data[position];
- subText.setText(city.getCountryCode() + "/" + city.getTimeZone());
- return view;
- }
- }
-}
diff --git a/api/android/sample-app-capitals/src/com/mapswithme/capitals/City.java b/api/android/sample-app-capitals/src/com/mapswithme/capitals/City.java
deleted file mode 100644
index 5ba6570e4d..0000000000
--- a/api/android/sample-app-capitals/src/com/mapswithme/capitals/City.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.capitals;
-
-import com.mapswithme.maps.api.MWMPoint;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-public class City
-{
- private final String id;
- private final String name;
- private final double lat;
- private final double lon;
- private final String countryCode;
- private final int population;
- private final int elevation;
- private final String timeZone;
- private final String altNames;
-
- public City(String id, String name, double lat, double lon,
- String countryCode, int population, int elevation,
- String timeZone, String altNames)
- {
- this.id = id;
- this.name = name;
- this.lat = lat;
- this.lon = lon;
- this.countryCode = countryCode;
- this.population = population;
- this.elevation = elevation;
- this.timeZone = timeZone;
- this.altNames = altNames;
- }
-
- @Override
- public String toString() { return name; }
- public MWMPoint toMWMPoint() { return new MWMPoint(lat, lon, name, id); }
-
- public String getId() { return id; }
- public String getName() { return name; }
- public double getLat() { return lat; }
- public double getLon() { return lon; }
- public String getCountryCode() { return countryCode; }
- public int getPopulation() { return population; }
- public int getElevation() { return elevation; }
- public String getTimeZone() { return timeZone; }
- public String getAltNames() { return altNames; }
-
-
- public static City fromMWMPoint(MWMPoint point)
- {
- City result = null;
- final String id = point.getId();
- if (id != null)
- {
- for (City city : CAPITALS)
- if (city.getId().equals(id))
- {
- result = city;
- break;
- }
- }
- return result;
- }
-
- public static class CityComparator implements Comparator<City>
- {
- @Override
- public int compare(City lhs, City rhs) { return lhs.getName().compareTo(rhs.getName()); }
- }
-
- public static City[] CAPITALS = {new City("3041563", "Andorra la Vella", 42.50779, 1.52109, "AD", 20430, -9999, "Europe/Andorra", "ALV,Ando-la-Vyey,Andora,Andora la Vela,Andora la Velja,Andora lja Vehl'ja,Andoro Malnova,Andorra,Andorra Tuan,Andorra a Vella,Andorra la Biella,Andorra la Vella,Andorra la Vielha,Andorra-a-Velha,Andorra-la-Vel'ja,Andorra-la-Vielye,Andorre-la-Vieille,Andò-la-Vyèy,Andòrra la Vièlha,an dao er cheng,andolalabeya,andwra la fyla,Ανδόρρα,Андора ла Веля,Андора ла Веља,Андора ля Вэлья,Андорра-ла-Велья,אנדורה לה וולה,أندورا لا فيلا,አንዶራ ላ ቬላ,アンドラ・ラ・ヴェリャ,安道爾城,안도라라베야"),
- new City("292968", "Abu Dhabi", 24.46667, 54.36667, "AE", 603492, -9999, "Asia/Dubai", "AEbu Saby,AUH,Aboe Dhabi,Abou Dabi,Abu Dabi,Abu Dabis,Abu Daby,Abu Daibi,Abu Dhabi,Abu Dhabi emiraat,Abu Zabi,Abu Zaby,Abu Zabye,Abu Zabyo,Abu Ḍabi,Abu Ḑabi,Abu-Dabi,Abu-Dabi khot,Abu-Dabio,Abu-Dzabi,Abud Dhabi,Abú Dabí,Abú Daibí,Abú Dhabí,Abú Zabí,Abû Daby,Abū Dabī,Abū Z̧aby,Abū Z̧abye,Abū Z̧abyo,Abū Z̧abī,Ampou Ntampi,Emirato de Abu Dabi,Gorad Abu-Dabi,a bu zha bi,abu dhabi,abu-zabi,abudabi,abudhabi,abwzby,aputapi,xa bud abi,Äbu Saby,Əbu-Dabi,Αμπου Νταμπι,Αμπού Ντάμπι,Абу Даби,Абу-Даби,Абу-Даби хот,Абу-Дабі,Горад Абу-Дабі,Әбү-Дәби шәһәре,Աբու Դաբի,אבו דאבי,أبوظبي,ئەبووزەبی,ابوظبی,ابوظہبی,अबु धाबी,अबू धाबी,আবুধাবি,ਅਬੂ ਧਾਬੀ,ଆବୁଧାବି,அபுதாபி,ಅಬು ಧಾಬಿ,അബുദാബി,අබුඩාබි,อาบูดาบี,ཨ་པོའུ་དྷ་པེ།,အဘူဒါဘီမြို့,აბუ-ზაბი,አቡ ዳቢ,アブダビ,阿布扎比,아부다비"),
- new City("1138958", "Kabul", 34.52813, 69.17233, "AF", 3043532, -9999, "Asia/Kabul", "Cabool,Caboul,Cabul,Cabul - kabl,Cabul - کابل,Cabura,Cabúl,Caubul,Gorad Kabul,KBL,Kabil,Kaboel,Kabol,Kaboul,Kabul,Kabula,Kabulas,Kabuli,Kabulo,Kabura,Kabúl,Kabûl,Kampoul,Kobul,Kubha,Kábul,Kâbil,Kābol,ka bu er,kabl,kabul,kabula,kabuli,kaburu,kabwl,kapul,ke bu er,khabul,Καμπούλ,Горад Кабул,Кабул,Кобул,Քաբուլ,קאבול,كابل,كابۇل,کابل,کابول,काबुल,কাবুল,କାବୁଲ,காபூல்,ಕಾಬುಲ್,കാബൂൾ,คาบูล,ཁ་པལ།,ཁ་པུལ།,ქაბული,ካቡል,ទីក្រុងកាបូល,カブール,カーブル,喀布尔,카불"),
- new City("3576022", "Saint John’s", 17.11667, -61.85, "AG", 24226, -9999, "America/Antigua", "Saint John,Saint John's,Saint John’s,Sent Dzonsas,Sent Džonsas,Sent Tzons,Sent-Dzhons,St Johns,St. John's,St.John.s,seinteujonseu,sentojonzu,sheng yue han,sheng yue han shi,snt g'wns,Σεντ Τζονς,Сент-Джонс,סנט ג'ונס,ሴንት ጆንስ፥ አንቲጋ እና ባርቡዳ,セントジョンズ,圣约翰,圣约翰市,세인트존스"),
- new City("3573374", "The Valley", 18.21704, -63.05783, "AI", 2035, 7, "America/Anguilla", "De Balei,The Valley,Valley,Valli,bare,deobaelli,Δε Βάλεϊ,Валли,ואלי,バレー,더밸리"),
- new City("3183875", "Tirana", 41.3275, 19.81889, "AL", 374801, -9999, "Europe/Tirane", "Gorad Tyrana,TIA,Theranda,Tiorana,Tiorána,Tiran,Tiran-a,Tirana,Tiranae,Tirane,Tirano,Tiranë,Tirāna,Tyranna,Tírana,Tîrana,de la na,tilana,tirana,tyrana,tyrnh,Τίρανα,Горад Тырана,Тиранæ,Тирана,Տիրանա,טיראנא,טירנה,تىرانا,تيرانا,تیرانا,तिराना,তিরানা,ਤਿਰਾਨਾ,ଟିରାନା,டிரானா,ടിറാന,ติรานา,ཐིས་རན།,ტირანა,ቲራና,ティラナ,地拉那,티라나"),
- new City("616052", "Yerevan", 40.18111, 44.51361, "AM", 1093485, -9999, "Asia/Yerevan", "Ayrivan,Djerevan,EREVAN,EVN,Eireavan,Eireaván,Ereban,Ereun,Erevan,Erevan osh,Erevana,Erevano,Erevanum,Erevàn,Ereván,Erevāna,Erewan,Erivan,Eriwan,Erywan,Erywań,Gierevan,Gorad Erehvan,Ierevan,Iereván,Iravan,Jerevan,Jerevanas,Jerevani,Jereván,Jerewan,Jerjewan,Revan,Yerevan,Yervandavan,Yerêvan,Yiriwan,Yèrèvan,Yérévan,ayrwan,ereban,erevani,iyerebhana,shhr ayrwan,ye li wen,yeleban,yeravana pranta,yere wan,yerevan,yerevana,yerevhana,yryfan,yrywan,Èrevan,Êrîvan,İrəvan,Γιερεβάν,Ερεβάν,Єреван,Јереван,Горад Ерэван,ЕРЕВАН,Ереван,Ереван ош,Երեվան,Երևան,יערעוואן,ירוואן,ایروان,شهر ایروان,يريفان,يېرېۋان,یریوان,یەریڤان,येरवान प्रान्त,येरेवान,येरेव्हान,ইয়েরেভান,யெரெவான்,เยเรวาน,ཡེ་རེ་ཝན།,ერევანი,ዬሬቫን,エレバン,葉里溫,예레반"),
- new City("2240449", "Luanda", -8.83682, 13.23432, "AO", 2776168, -9999, "Africa/Luanda", "Gorad Luanda,LAD,Loanda,Louanda,Louanta,Luand,Luanda,Luandae,Luando,Lwanda,Lúanda,Sao Paolo de Loanda,Sao Paulo da Assuncao de Luanda,Sao Paulo de Loanda,Sao Paulo de Luanda,São Paolo de Loanda,São Paulo da Assunção de Luanda,São Paulo de Loanda,São Paulo de Luanda,lu'anda,luanda,luo an da,luvanta,luxanda,luyanda,lwanda,ruanda,Λουάντα,Горад Луанда,Луандæ,Луанда,Լուանդա,לואנדה,لوآندا,لواندا,لونڈا,लुआंडा,লুয়ান্ডা,ਲੁਆਂਦਾ,லுவாண்டா,ลูอันดา,ལའུན་ཌ།,ლუანდა,ሏንዳ,ルアンダ,罗安达,루안다"),
- new City("3435910", "Buenos Aires", -34.61315, -58.37723, "AR", 13076300, -9999, "America/Argentina/Buenos_Aires", "BUE,Baires,Bonaero,Bonaeropolis,Bonaëropolis,Bos Aires,Bouenos Aires,Bouonezar,Bouonézâr,Buehnos Ajres,Buehnos-Ajres,Buehnos-Ajres osh,Buenos Aires,Buenos Airės,Buenos Ajres,Buenos Ayres,Buenos-Aires,Buenos-Ajres,Buenos-Ayres,Buenos-Aýres,Buenosairesa,Buénos Ayrés,Bwenoze,Bwènozè,Búenos Aíres,Ciudad Autonoma de Buenos Aires,Ciudad Autónoma de Buenos Aires,Ciudad de La Santisima Trinidad y Puerto de Santa Maria del Buen Ayre,Ciudad de La Santísima Trinidad y Puerto de Santa María del Buen Ayre,Gorad Buehnas-Ajrehs,Lungsod ng Buenos Aires,Santa Maria del Buen Ayre,Santa María del Buen Ayre,bawnosxires,bu yi nuo si ai li si,bu'enosa a'iresa,buenos-airesi,buenosaires,buenoseuaileseu,buenosuairesu,buraenosa a'iresa,buyenosa a'iresa,bwyns ayrs,bwynws ayrs,bwynws ayrys,byu'enosa erisa,byunas airis,byunas ayels,bywns ayrs,puvenas airis,Μπουένος ΄Aιρες,Μπουένος Άιρες,Буенос Аирес,Буенос Айрес,Буенос Аірес,Буенос Ајрес,Буенос-Аирес,Буенос-Айрес,Буэнос Айрес,Буэнос-Айрес,Буэнос-Айрес ош,Горад Буэнас-Айрэс,Բուենոս Այրես,בואנוס איירס,בוענאס איירעס,بوئنوس آیرس,بوينس آيرس,بوينوس ايريس,بۆینس ئایرس,بیونس آئرس,बुएनोस आइरेस,ब्युएनॉस एरीस,বুয়েনোস আইরেস,বুৱেনোস আইরেস,புவெனஸ் ஐரிஸ்,ಬ್ಯೂನಸ್ ಐರಿಸ್,ബ്യൂണസ് അയേഴ്സ്,บัวโนสไอเรส,པུ་ཨེ་ནོ་སི་ཨས་རི་སི།,ဗျူနိုအေးရိစ်မြို့,ბუენოს-აირესი,ብዌኖስ አይሬስ,ブエノスアイレス,布宜諾斯艾利斯,布宜诺斯艾利斯,부에노스아이레스"),
- new City("5881576", "Pago Pago", -14.27806, -170.7025, "AS", 11500, 2, "Pacific/Pago_Pago", "PPG,Pago Pago,Pagopago,pa ko pa ko,pagopago,Паго Паго,Пагопаго,ปาโกปาโก,パゴパゴ"),
- new City("2761369", "Vienna", 48.20849, 16.37208, "AT", 1691468, 171, "Europe/Vienna", "Bec,Bech,Becs,Beç,Beč,Bienne,Bécs,Dunaj,VIE,Vena,Viden,Viden',Vieden,Viedeň,Viena,Vienna,Vienne,Vieno,Viin,Vin,Vinarborg,Vindobona,Viyana,Vídeň,Vín,Vínarborg,Wenen,Wieden,Wiedeń,Wien,bin,weiynna,Βιέννη,Беч,Вена,Виена,Відень,เวียนนา,ቪየና,빈"),
- new City("2172517", "Canberra", -35.28346, 149.12807, "AU", 327700, -9999, "Australia/Sydney", "CBR,Camberra,Canberra,Canberrah,Gorad Kanbera,Kamberra,Kambra,Kampera,Kanapera,Kanbera,Kanbero,Kanberr,Kanberra,Kanberrae,Kanbérra,Kānapera,kaenbeola,kainabara,kan pei la,kanabera,kanbera,kanbra,kanpara,kenabera,kyanabera,kyanbera,kynbra,qnbrh,Καμπέρα,Горад Канбера,Канбера,Канберрæ,Канберра,Канбєра,Կանբերրա,קאנבערא,קנברה,كانبرا,کانبرا,کینبرا,कॅनबेरा,कैनबरा,ক্যানবেরা,ਕੈਨਬਰਾ,କାନବେରା,கான்பரா,කැන්බරා,แคนเบอร์รา,ཁན་པེ་ར།,კანბერა,ქანბერა,ካንበራ,キャンベラ,坎培拉,堪培拉,캔버라"),
- new City("3577154", "Oranjestad", 12.52398, -70.02703, "AW", 29998, 5, "America/Aruba", "Oran'estad,Oraniestad,Oranjestad,oraniesutaddo,Ораниестад,Ораньестад,オラニエスタッド"),
- new City("3041732", "Mariehamn", 60.09726, 19.93481, "AX", 10682, -9999, "Europe/Mariehamn", "MHQ,Maarianhamina,Marianhamina,Mariankhamina,Mariehameena,Mariehamn,Mariekhamn,Mariuhoefn,Mariyekhamn,Marrianhamina,Maríuhöfn,mariehamun,Мариехамн,マリエハムン"),
- new City("587084", "Baku", 40.37767, 49.89201, "AZ", 1116513, -9999, "Asia/Baku", "BAK,Bacu,Bacú,Baki,Bako,Bakoe,Bakou,Baku,Bakue,Bakuo,Bakuu,Baky,Bakó,Bakú,Bakû,Bakü,Bakı,Baqu,Boku,Gorad Baku,Mpakou,ba ku,bakku,bako,baku,bakw,bakww,pakku,Μπακού,Баку,Бакы,Баҡы,Боку,Горад Баку,Բաքու,באקו,باكو,باکو,باکوو,बाकु,बाकू,বাকু,பாக்கு,ബക്കു,บากู,པཱ་ཁི།,ბაქო,ባኩ,バクー,巴库,바쿠"),
- new City("3191281", "Sarajevo", 43.84864, 18.35644, "BA", 696731, -9999, "Europe/Sarajevo", "Bosna-Sarai,Gorad Saraeva,SJJ,Saarayego,Saireavo,Sairéavó,Saraevo,Saragebo,Saragiebo,Saragievo,Saraievo,Sarajeva,Sarajevas,Sarajevo,Sarajevó,Sarajewo,Sarajèvo,Saraybosna,Sarayevo,Sarayevu,Seraium,Serayevo,Szarajevo,Szarajevó,Vrh Bosna,carayevo,sai la ye fu,salayebo,saraevo,saraevu~o,sarajyww,sarayebho,sarayevho,sarayevo,sarayewo,sarayww,sarayyfw,srayyfw,srayyww,Σαράγεβο,Σαράγιεβο,Σαραγιεβο,Горад Сараева,Сараево,Сараєво,Сарајево,Сараѥво,Սարաևո,סאראיעווא,סראייבו,ساراجیوو,ساراييفو,سارايېۋو,سارایوو,سارایێڤۆ,سرائیوو,سراييفو,सारायेव्हो,সারায়েভো,ਸਾਰਾਯੇਵੋ,சாரயேவோ,ซาราเยโว,ས་ར་ཇི་བོ།,სარაევო,ሳራዬቮ,サラエヴォ,塞拉耶佛,사라예보"),
- new City("3374036", "Bridgetown", 13.1, -59.61667, "BB", 98511, -9999, "America/Barbados", "BGI,Bridgetown,Bridzhtaun,Bridztaun,Bridztaunas,Bridžtaunas,The Bridge Town,beulijitaun,brydj tawn,bu li qi dun,burijjitaun,Бриджтаун,Бриџтаун,ברידג'טאון,بريدج تاون,ብርጅታውን,ブリッジタウン,布里奇敦,브리지타운"),
- new City("1185241", "Dhaka", 23.7104, 90.40744, "BD", 10356500, -9999, "Asia/Dhaka", "DAC,Daca,Dacca,Dacca - dhaka,Dacca - ঢাকা,Daka,Dakah,Dakk,Dakka,Dakkae,Dako,Dgaka,Dhaka,Dháka,Dhâkâ,Dəkkə,Gorad Daka,Mujib City,Ntaka,Ntakka,da ka,da ka shi,daka,dakka,dhaka,dhakka,dka,takka,thaka,Ντάκα,Ντάκκα,Горад Дака,Дака,Даккæ,Дакка,Дгака,Դաքքա,דאקא,דאקה,داكا,داككا,داکا,دكا,ڈھاکہ,ޑާކާ,ढाका,ঢাকা,ਢਾਕਾ,ઢાકા,ଢାକା,டாக்கா,ఢాకా,ಢಾಕಾ,ഢാക്ക,ธากา,དྷ་ཁ།,ဒါကာမြို့,დაკა,ዳካ,ダッカ,达卡,达卡市,다카"),
- new City("2800866", "Brussels", 50.85045, 4.34878, "BE", 1019022, -9999, "Europe/Brussels", "An Bhruiseil,An Bhruiséil,BRU,Breissel,Brisel,Brisele,Briuselis,Brjuksel,Brjusel',Brjussel',Brueksel,Bruessel,Bruesszel,Bruiseal,Bruksel,Bruksela,Brukseli,Brukselo,Brusehl',Brusel,Brusela,Bruselas,Bruseles,Bruselj,Bruselo,Brusel·les,Brussel,Brussele,Brussels,Brussel·les,Bruxel,Bruxelas,Bruxellae,Bruxelles,Brwsel,Bryssel,Bryusel,Bryxelles,Bréissel,Brüksel,Brüssel,Brüsszel,Citta di Bruxelles,Città di Bruxelles,Kota Brusel,beulwisel,braselsa,brassels,briuseli,brwksl,brysl,bu lu sai er,buryusseru,Βρυξέλλες,Брисел,Брусэль,Брюксел,Брюсель,Брюссель,Բրյուսել,בריסל,بروكسل,بروکسل,بريۇسسېل,ܒܪܘܟܣܠ,ब्रसेल्स,บรัสเซลส์,ბრიუსელი,ブリュッセル,布鲁塞尔,브뤼셀"),
- new City("2357048", "Ouagadougou", 12.36566, -1.53388, "BF", 1086505, -9999, "Africa/Ouagadougou", "Gorad Uagadugu,OUA,Ouagadouga,Ouagadougou,Ouankantounkou,Owagadugu,Uagadougou,Uagadugu,Uagaduguo,Uagadugú,Uaqaduqu,Vagadugu,Wagadugu,awagadwgw,uagadugu,vagadugu,vakatuku,wa jia du gu,wa ka du ku,wagado~ugu,wagadugu,waghadwghw,Ουαγκαντουγκού,Ουαγκαντούγκου,Горад Уагадугу,Уагадугу,Ուագադուգու,ואגאדוגו,ئۆئاگادۆگۆ,اوآگادوگو,اواگادوگو,اوگاڈوگو,واغادوغو,वागाडुगू,ਵਾਗਾਦੁਗੂ,வாகடூகு,วากาดูกู,ཨོ་འ་ག་དོའུ་གོའུ།,უაგადუგუ,ዋጋዱጉ,ワガドゥグー,瓦加杜古,와가두구"),
- new City("727011", "Sofia", 42.69751, 23.32415, "BG", 1152556, -9999, "Europe/Sofia", "Gorad Safija,SOF,Serdica,Sofi,Sofia,Sofie,Sofii,Sofij,Sofija,Sofija osh,Sofio,Sofiya,Sofiýa,Sofja,Sofya,Sofía,Soifia,Sophia,Sredets,Szofia,Szófia,Sòfia,Sófia,Sófía,Sóifia,Ulpia Serdica,cohviya,saphiya,seaphiya,sofeiy,sofi'a,sofia,sophiya,sopia,suo fei ya,swfya,swfyh,swpyh,Σόφια,Горад Сафія,Софи,Софий,София,София ош,Софија,Софія,Софїꙗ,Սոֆիա,סאפיע,סופיה,سوفىيە,سۆفیا,صوفيا,صوفیه,صوفیہ,सोफिया,সফিয়া,ਸੋਫ਼ੀਆ,சோஃவியா,സോഫിയ,โซเฟีย,སོ་ཧྥི་ཡ།,სოფია,ሶፊያ,ソフィア,索菲亞,소피아,𐍃𐍉𐍆𐌹𐌰"),
- new City("290340", "Manama", 26.21536, 50.5832, "BH", 147074, -9999, "Asia/Bahrain", "Al Manama,Al Manamah,Al Manāma,Al Manāmah,Al-Manama,Al-Manamah,BAH,Maenamae,Manama,Manamae,Manamah,Manameh,Manamo,Manáma,Menama,Mänamä,aalmanamat,mai na mai,manama,mnamt,Μανάμα,Манамæ,Манама,Մանամա,מנאמה,اَلْمَنَامَة,منامة,মানামা,ማናማ,マナーマ,麦纳麦,마나마"),
- new City("425378", "Bujumbura", -3.3822, 29.3644, "BI", 331700, -9999, "Africa/Bujumbura", "BJM,Budzumbura,Bujumbura,Bujumburo,Buj·umbura,Buzhumbura,Buzumbura,Buĵumburo,Bużumbura,Bužumbūra,Mpouzoumpoura,Usumbura,bu qiong bu la,bujumbula,bujunbura,bwg'wmbwrh,bwjwmbra,bwjwmbwra,Μπουζουμπούρα,Бужумбура,Буџумбура,Բուժումբուրա,בוג'ומבורה,بوجومبرا,بوجومبورا,ቡጁምቡራ,ブジュンブラ,布琼布拉,부줌부라"),
- new City("2392087", "Porto-Novo", 6.49646, 2.60359, "BJ", 234168, -9999, "Africa/Porto-Novo", "Porto Nobo,Porto Novas,Porto Novo,Porto-Novo,Pôrto-Novo,bo duo nuo fu,poleutonobo,porutonobo,pwrtw nwbw,pwrtw nwww,xin gang,Πόρτο Νόβο,Порто Ново,Порто-Ново,פורטו נובו,پورتو نووو,ፖርቶ ኖቮ,ポルトノボ,新港,波多诺伏,포르토노보"),
- new City("3579132", "Gustavia", 17.89618, -62.84978, "BL", 5988, -9999, "America/St_Barthelemy", "Gustaf,Guthavia"),
- new City("3573197", "Hamilton", 32.29149, -64.77797, "BM", 902, -9999, "Atlantic/Bermuda", "BDA,Hamilton"),
- new City("1820906", "Bandar Seri Begawan", 4.94029, 114.94806, "BN", 64409, -9999, "Asia/Brunei", "BWN,Banda Seri,Bandar Seri Begavan,Bandar Seri Begavanas,Bandar Seri Begawan,Bandar Sery Begawan,Bandar-Seri-Begavan,Bandar-Seri-Begavano,Bandarseribegavana,Brunei,Brunei Town,Bruni,Gorad Bandar-Sery-Begavan,Mpantar Seri Mpenkaban,badara seri begavana,ban dar se ribe ka wan,bandaleuseulibeugawan,bandar seri bagevan,bandar-seri-begavani,bandara seri bega'oyana,bandara sri bagavana,bandarusuribugawan,bndr sry bgawan,bndr sry bkawan,bndr sry bygwan,pantar ceri pekavan,si li ba jia wan shi,Μπαντάρ Σερί Μπεγκαβάν,Бандар Сери Бегаван,Бандар-Сери-Бегаван,Бандар-Сері-Бегаван,Горад Бандар-Серы-Бегаван,Բանդար Սերի Բեգավան,בנדר סרי בגוואן,باندار سەرى بەگاۋان,بندر سري بكاوان,بندر سری بگاوان,بندر سری بیگوان,بەندەر سێری بێگاوان,बंदर स्री बगवान,বন্দর সেরি বেগাওয়ান,ਬੰਦਰ ਸੇਰੀ ਬੇਗਵਾਨ,பண்டர் செரி பெகாவான்,ಬಂದರ್ ಸೆರಿ ಬಗೆವನ್,บันดาร์เสรีเบกาวัน,སི་རི་པེ་ཀ་མཚོ་ཁུགས་གྲོང་ཁྱེར།,ဘန်ဒါဆရီဘဂါဝမ်မြို့,ბანდარ-სერი-ბეგავანი,ባንዳር ሰሪ ቤጋዋን,バンダルスリブガワン,斯里巴加湾市,斯里巴加灣市,반다르스리브가완"),
- new City("3903987", "Sucre", -19.03332, -65.26274, "BO", 224838, -9999, "America/La_Paz", "Chuqichaka,Chuquisaca,Ciudad Sucre,Gorad Sukreh,Ijoloti Sukre,SRE,Sik,Soukre,Sucre,Sucre toertenelmi ovarosa,Sucre történelmi óvárosa,Sukre,Sukri,Sukro,Sukrė,Súkre,su ke lei,su ker,sukare,sukeule,sukre,sukure,swkrh,swkry,swqrh,Σούκρε,Горад Сукрэ,Иёлоти Сукре,Сукре,Սուկրե,סוקרה,سوكري,سوکره,سکرے,سۇكرې,सुक्रे,ਸੂਕਰੇ,ซูเกร,སུ་ཁུ་རེ།,სუკრე,スクレ,苏克雷,수크레"),
- new City("3513563", "Kralendijk", 12.15, -68.26667, "BQ", 3081, -9999, "America/Kralendijk", "Kralendijk,Playa"),
- new City("3469058", "Brasília", -15.77972, -47.92972, "BR", 2207718, -9999, "America/Sao_Paulo", "BSB,Brasilia,Brasília,Brazilia,Brazilija,Braziljo,Brazília,Mprazilia,Urbs Brasilia,ba xi li ya,beulajillia,brazylya,brzylyh,burajiria,Μπραζίλια,Бразилиа,Бразилия,Бразилија,Ҳавзаи федералии Бразилиа,Բրազիլիա քաղաք,ברזיליה,برازيليا,برازیلیا,ብራዚሊያ,ブラジリア,巴西利亚,브라질리아"),
- new City("3571824", "Nassau", 25.05823, -77.34306, "BS", 227940, -9999, "America/Nassau", "City of Nassau,NAS,Nasau,Nassaou,Nassau,Nassau City,na sao,naso,nasso,Νασσάου,Нассау,נסאו,ናሶ,ナッソー,拿骚,나소"),
- new City("1252416", "Thimphu", 27.46609, 89.64191, "BT", 98676, 2320, "Asia/Thimphu", "Gorad Tkhimpkhu,Thimbu,Thimfou,Thimpago,Thimphou,Thimphu,Thimpu,Timbu,Timbuo,Timfou,Timfu,Timfú,Timphu,Timpou (therine) Pounaka (cheimerine),Timpu,Timpû,Tkhimpkhu,thim phu,thimphu,thimpu,thiphu,thymphw,timbu,timphu,timpu,ting bu,tinpu,tymfw,tymfww,Θίμφου,Τιμπού (θερινή) Πουνάκα (χειμερινή),Горад Тхімпху,Тимбу,Тхимпху,Тхімпху,Թհիմփհու,טהימפהו,تىمپۇ,تيمفو,تھمپو,تیمفو,تیمفوو,ٹھمپھو,थिंफू,थिम्फू,থিম্পু,ਥਿੰਫੂ,ଥିମ୍ପୁ,திம்பு,థింపూ,ಥಿಂಪು,തിംഫു,ทิมพู,ཐིམ་ཕུ།,ཐིམ་ཕུུུུ,თიმფუ,ጢምጱ,ティンプー,廷布,팀부"),
- new City("933773", "Gaborone", -24.65451, 25.90859, "BW", 208411, -9999, "Africa/Gaborone", "GBE,Gaberones,Gaberones Village,Gaberono,Gaboron,Gaboronas,Gaborone,Gaboròn,Gaboróne,Gorad Gabaroneh,IGaborone,Nkamporone,Qaborone,gabolone,gaborone,gaboroni,gabwrwn,gbrwn,gebaroni,goborni,haborone,jabwrwn,jia bai long li,ka bo rone,kaparoni,Γκαμπορόνε,Габороне,Горад Габаронэ,Գաբորոնե,גאבורון,جابورون,گابورون,گابۆرۆن,گبرون,गॅबारोनी,गोबोर्नी,ਗਾਬੋਰੋਨੀ,காபரோனி,กาโบโรเน,ག་བོ་རོ་ནི།,გაბორონე,ጋበሮኔ,ጋቦሮን,ハボローネ,嘉柏隆里,가보로네"),
- new City("625144", "Minsk", 53.9, 27.56667, "BY", 1742124, -9999, "Europe/Minsk", "Gorad Minsk,MSQ,Mins'k,Minsc,Minscum,Minsk,Minsk - Minsk,Minsk - Мінск,Minsk osh,Minska,Minskaj,Minskas,Minsko,Minszk,Mińsk,Myensk,Myenyesk,Mînsk,ming si ke,ming si ke shi,minseukeu,minsk,minsuku,mnsk,mynsk,mynsq,mynysky,Μινσκ,Горад Мінск,Минск,Минск ош,Минскай,Мінск,Мінськ,Мѣньскъ,Մինսկ,מינסק,منسک,مىنىسكى,مينسك,مینسک,मिन्‍स्‍क,மின்ஸ்க்,ಮಿನ್ಸ್ಕ್,മിൻസ്ക്,มินสก์,མིན་སིཀ།,მინსკი,ミンスク,明斯克,明斯克市,민스크"),
- new City("3582672", "Belmopan", 17.25, -88.76667, "BZ", 13381, -9999, "America/Belize", "BCV,Bel'mopan,Belmopan,Belmopanas,Belmopano,Belmopán,Bèlmopan,Hattieville,Mopan,Mpelmopan,bei er mo bang,belmopan,berumopan,blmwpan,blmwpn,Μπελμοπάν,Белмопан,Бельмопан,Բելմոպան,בלמופן,بلموپان,ቤልሞፓን,ベルモパン,貝爾墨邦,벨모판"),
- new City("6094817", "Ottawa", 45.41117, -75.69812, "CA", 812129, -9999, "America/Toronto", "Gorad Atava,Otava,Otavo,Otawa,Ottaba,Ottahua,Ottava,Ottavae,Ottawa,YOW,atawa,atoya,attava,awtawa,otava,otawa,ottava,wo tai hua,xxttawa,ŸAA¬²±,Οττάβα,Οτταβα,Горад Атава,Отава,Оттавæ,Оттава,Օտտավա,אוטווה,אטאווא,أوتاوا,ئۆتاوا,اتاوا,اوتآوآ,اوٹاوا,اٹاوہ,ओटावा,অটোয়া,ਓਟਾਵਾ,ଓଟାୱା,ஒட்டாவா,ಆಟ್ಟಾವಾ,ഓട്ടവ,ออตตาวา,ཨོ་ཏ་ཝ།,အော့တဝမြို့,ოტავა,ኦታዋ,ᎠᏔᏩ,ᐊᑐᕚ/atavaa,オタワ,渥太華,오타와"),
- new City("7304591", "West Island", -12.15681, 96.82251, "CC", 120, -9999, "Indian/Cocos", ""),
- new City("2314302", "Kinshasa", -4.32142, 15.30807, "CD", 7785965, -9999, "Africa/Kinshasa", "FIH,Gorad Kinshasa,Kinchasa,Kinsasa,Kinsaso,Kinshasa,Kinsjasa,Kinszasa,Kinsásá,Kinŝaso,Kinşasa,Kinšasa,Kînşasa,Leopoldstad,Leopoldville,Léopoldville,jin xia sha,kin cha sa,kinasasa,kinsaca,kinsasa,kinshasa,kinsyasa,knshasa,kynshasa,Κινσάσα,Горад Кіншаса,Киншаса,Кіншаса,Կինշասա,קינשאזע,קינשאסה,كينشاسا,کنشاسا,کنشاسہ,کینشاسا,किन्शासा,ਕਿਨਸ਼ਾਸਾ,கின்ஷாசா,കിൻഷസ,กินชาซา,ཀིན་ཤ་ས།,ကင်ရှာဆာမြို့,კინშასა,ኪንሻሳ,キンシャサ,金夏沙,킨샤사"),
- new City("2389853", "Bangui", 4.36122, 18.55496, "CF", 542393, -9999, "Africa/Bangui", "BGF,Bangi,Bangis,Bangui,Mpan'nkoui,ban ji,bang-gi,bangi,bangwyy,Μπανγκουί,Банги,Бангі,בנגואי,بانگوئی,ባንጊ,バンギ,班基,방기"),
- new City("2260535", "Brazzaville", -4.26613, 15.28318, "CG", 1284609, -9999, "Africa/Brazzaville", "BZV,Braza,Brazavil,Brazavilis,Brazavilo,Brazzavil',Brazzaville,Maya-Maya,Mprazabil,N'Tamo,beulajabil,brazafyl,brazawyl,brzwwyl,bu la chai wei er,burazavu~iru,Μπραζαβίλ,Браззавиль,ברזוויל,برازافيل,برازاویل,ብራዛቪል,ブラザヴィル,布拉柴维尔,브라자빌"),
- new City("2661552", "Bern", 46.94809, 7.44744, "CH", 121631, -9999, "Europe/Zurich", "BRN,Bann,Beirn,Ben,Bern,Berna,Bernas,Berne,Berno,Bundesstadt,Bèn,Bèrna,Gorad Bern,atharvaveda,ban he na,barna,beirn,beleun,berna,berni,berun,bo en,bo er ni,brn,byrn,pern,Βέρνη,Берн,Горад Берн,Բեռն,בערן,ברן,برن,بيرن,بێرن,بېرن,ܒܪܢ,अथर्ववेद,बर्न,বের্ন,ବର୍ନ,பேர்ன்,ബേൺ,เบิร์น,པེར་ནེ།,ბერნი,ቤርን,ベルン,伯尔尼,伯恩,办合纳,베른"),
- new City("2279755", "Yamoussoukro", 6.82055, -5.27674, "CI", 194530, -9999, "Africa/Abidjan", "ASK,Giamoussoukro,Gorad Jamusukra,Jamusukras,Jamusukro,Yamosukro,Yamousoukro,Yamoussokro,Yamoussoukro,Yamussukro,Yamusukro,ya mu su ke luo,ya mussu kor,yamusukaro,yamusukeulo,yamusukro,yamusukuro,yamwswkrw,ywmwswkrw,Γιαμουσσούκρο,Јамусукро,Горад Ямусукра,Ямусукро,Յամուսուկրո,יאמוסוקרו,ياموسوكرو,يامۇسسۇكرو,یاموسوکرو,یامۆسۆکرۆ,یوموسوکرو,यामूसूक्रो,ਯਾਮੂਸੂਕਰੋ,ยามุสซุโกร,ཡམ་སོ་ཁེ་རོ།,იამუსუკრო,ያሙሱክሮ,ヤムスクロ,亚穆苏克罗,야무수크로"),
- new City("4035715", "Avarua", -21.20778, -159.775, "CK", 13373, -9999, "Pacific/Rarotonga", "Avarua,Avarúa,RAR,abarua,Аваруа,アバルア"),
- new City("3871336", "Santiago", -33.45694, -70.64827, "CL", 4837295, -9999, "America/Santiago", "Ciles Santjagas,CiudadSantiago,SCL,Sanctiacobi,Sant'jago,Santiago,Santiago de Chile,Santiago de Xile,Santiago del Cile,Santiago do Chile,Santiago du Chili,Santiago du Ch·ili,Santjago,Santjago de Chile,Santjago de Chili,Stgo.,santiago,santixako,santyaghw,santyagw,santyyagw,sheng de ya ge,Čilės Santjagas,Σαντιάγο,Сантьяго,Сантяго де Чиле,Сантяго де Чили,סנטיאגו דה צ'ילה,سانتىياگو,سانتياغو,سانتیاگو,ซันติอาโก,სანტიაგო დე ჩილე,ሳንቲያጎ,サンティアゴ,圣地亚哥,산티아고"),
- new City("2220957", "Yaoundé", 3.86667, 11.51667, "CM", 1299369, -9999, "Africa/Douala", "Giaounte,Gorad Jaundeh,Jande,Jaunde,Jaundeo,Jaundė,Jaúnde,Jánde,YAO,Yaounde,Yaoundé,Yaunde,Yaundé,Yawunde,iaunde,ya wen de,ya'unde,yaunde,yavunte,yawndy,yaxunde,yaywndh,Γιαουντέ,Јаунде,Горад Яундэ,Яунде,Յաունդե,יאונדה,יאונדע,ياوندي,یاؤندے,یائونده,یائوندێ,یاونڈی,याउंदे,ਯਾਊਂਦੇ,யாவுண்டே,ยาอุนเด,ཡོན་དྷི།,იაუნდე,ያዉንዴ,ヤウンデ,雅温得,야운데"),
- new City("1816670", "Beijing", 39.9075, 116.39723, "CN", 7480601, -9999, "Asia/Shanghai", "BJS,Bac Kinh,Baek-ging,Baekging,Behehzhin,Beijing,Beijing Shi,Beising,Beixin,Beixín,Bejdzing,Bejdżing,Bejing,Beyjing,Beȝcinȝ,Báe̤k-gĭng,Béising,Bắc Kinh,Gorad Pekin,Pechin,Pechino,Pechinu,Pechinum,Pecinum,Pei-ching,Pei-ching-shih,Pei-p'ing,Pei-p'ing-shih,Peken,Pekin,Pekin',Pekina,Pekinas,Peking,Pekini,Pekino,Pekín,Pekîn,Peping,Pequim,Pequin,Pequín,Pet-kin,Pet-kîn,Peycing,Pikkin,Pèquin,Pékin,Péqùin,Péycing,be'ijim,be'ijina,be'ijinga,bei jing,bei jing shi,beidjin,beijing si,bijiga,bijing,bijinga,bkyn,buggyeong,byjng,bykyn,byyg'yng,byyzsyng,pakking,peyjin,pkn,Πεκίνο,Бейжің,Бээжин,Бәәҗң балһсн,Горад Пекін,Пекин,Пекинг,Пекін,Пекінґ,Պեկին,בייג'ינג,בייזשינג,بكين,بيكين,بیجنگ,بېجینګ,بېيجىڭ,بېيجىڭ شەھىرى,پکن,پێکەن,ބީޖިންގ,बीजिंग,बेइजिङ,বেইজিং,ਬੀਜਿੰਗ,બેઇજિંગ,பெய்ஜிங்,బీజింగ్,ಬೀಜಿಂಗ್,ബെയ്‌ജിങ്ങ്‌,බෙයිජිං,ปักกิ่ง,པེ་ཅིང་གྲོང་ཁྱེར།,ပေကျင်းမြို့,პეკინი,ቤዪጂንግ,ប៉េកាំង,北京,北京市,베이징 시,북경"),
- new City("3688689", "Bogotá", 4.60971, -74.08175, "CO", 7102602, -9999, "America/Bogota", "Bogota,Bogoto,Bogotà,Bogotá,Boqota,Bógóta,Gorad Bagata,Mponkota,Santa-Fe-de-Bogota,Santafe de Bogota,Santafe de Bogotá,Santafé de Bogotá,Wukuta,beageatta,bo ge da,bogota,bokota,bwghwta,bwgwta,bwgwth,bwjwta,pokotta,Μπογκοτά,Богота,Боґота,Горад Багата,Санта-Фе-де-Богота,Բոգոտա,באגאטא,בוגוטה,بوجوتا,بوغوتا,بوگوتا,بگوٹا,बोगोटा,बोगोता,বোগোতা,ਬੋਗੋਤਾ,ବୋଗୋଟା,பொகோட்டா,ಬೊಗೋಟ,ബൊഗോട്ട,โบโกตา,པོ་གོ་ཏ,ဘိုဂိုတာမြို့,ბოგოტა,ቦጎታ,ទីក្រុងបូកូតា,ボゴタ,波哥大,보고타"),
- new City("3621849", "San José", 9.93333, -84.08333, "CR", 335007, -9999, "America/Costa_Rica", "Gorad San-Khaseh,SJO,San Chose,San Chosė,San Jose,San Jose de Costa Rica,San Jose i Costa Rica,San José,San José de Costa Rica,San José i Costa Rica,San Joze,San Jozé,San Jusiy,San Khose,San Khoze,San Xose,San Xosé,San-Joseo,San-Khose,San-Xose,Sanhose,Sanhosē,can hoce,san khwsyh, kwstaryka,san khwzh,san-khose,sana hoje,sana hose,sana hoze,sanhose,sheng he xi,sn hwsh,syana hose,Σαν Χοσέ,Горад Сан-Хасэ,Сан Хозе,Сан Хосе,Сан-Хосе,Սան Խոսե,סאן חוסה,סן חוסה,سان خوزه,سان خوسيه، كوستاريكا,سان خوسې,سان ہوزے,सान होज़े,सान होजे,স্যান হোসে,ਸਾਨ ਹੋਸੇ,சான் ஹொசே,ซันโฮเซ,སན་ཇོ་སེ།,სან-ხოსე,ሳን ሆዜ,サンホセ,聖荷西,산호세"),
- new City("3553478", "Havana", 23.13302, -82.38304, "CU", 2163824, -9999, "America/Havana", "A Habana,Abana,Gavana,Gavanae,Gorad Gavana,HAV,Habana,Hafana,Hahvaxnaz,Havana,Havanna,Havano,Hawana,Khavana,L'Avan-a,L'Avana,L'Avann-a,L'Habana,L'Havana,La Ahuana,La Avan,La Avàn,La Habana,La Havane,S'Avana,abana,avana,ha wa na,habana,habhana,hafana,havana,hawana,Ħavana,Ł'Avana,Αβάνα,Гаванæ,Гавана,Горад Гавана,Хавана,Ҳавана,Հավանա,הוואנה,هافانا,هاوانا,ہوانا,हवाना,ਹਵਾਨਾ,ହାଭାନା,அவானா,ഹവാന,ฮาวานา,ཧ་ཝན,ჰავანა,ሀቫና,ሀኖይ,ハバナ,哈瓦那,아바나"),
- new City("3374333", "Praia", 14.93152, -23.51254, "CV", 113364, 0, "Atlantic/Cape_Verde", "Braia,Cidade da Praia,Gorad Praja,Municipio da Praia,Município da Praia,Pragia,Praia,Praja,Prajo,Praya,RAI,braya,pei ya,peulaia,pirxa,pra'i'a,pra'iya,praya,prayya,puraia,Πράγια,Πράια,Горад Прая,Прая,Праја,Պրայա,פראיה,برايا,پرائا,پرائیا,پرايا,پرایا,پڕایا,प्राईया,ਪ੍ਰਾਈਆ,ไปรอา,ཕུ་ར་ཡ།,პრაია,ፕራያ,プライア,培亞,프라이아"),
- new City("3513090", "Willemstad", 12.1084, -68.93354, "CW", 125000, -9999, "America/Curacao", "Vilemstad,Willemstad,billemseutadeu,u~iremusutaddo,wei lian si ta de,Вилемстад,וילמסטאד,ウィレムスタッド,威廉斯塔德,빌렘스타드"),
- new City("2078127", "Flying Fish Cove", -10.42172, 105.67912, "CX", 500, -9999, "Indian/Christmas", "Flying Fish Cove,The Settlement"),
- new City("146268", "Nicosia", 35.16667, 33.36667, "CY", 200452, -9999, "Asia/Nicosia", "An Leafcois,An Leafcóis,Arqa Nikosiya,Gorad Nikasija,Lefkosa,Lefkosha,Lefkosia,Lefkosian,Lefkosía,Lefkoşa,Levkozija,NIC,Nicosea,Nicosia,Nicosia (Lefkosia),Nicosia - Leukosia,Nicosia - Λευκωσία,Nicosie,Nicoséa,Nicosìa,Nicòsia,Nicósia,Nikosi,Nikosia,Nikosie,Nikosii,Nikosija,Nikosiya,Nikozi,Nikozia,Nikozija,Nikozio,Nikozja,Nikósie,Nikósía,Nikózia,ni ke xi ya,ni kho seiy,nikkociya,nikoshia,nikosi'a,nikosia,nikosiya,nikozia,nykwsya,nykwzya,nyqwsya,nyqwsyh,Λευκωσία,Λευκωσίαν,Горад Нікасія,Левкозија,Лефкоша,Никозия,Никозија,Никоси,Никосия,Нікосія,Նիկոսիա,ניקאסיע,ניקוסיה,نىكوسىيە,نيقوسيا,نيكوسيا,نیکوزیا,نیکوسیا,نیکۆسیا,निकोसिया,নিকোসিয়া,ਨਿਕੋਸੀਆ,ନିକୋସିଆ,நிக்கோசியா,นิโคเซีย,ནེ་ཁོ་ཤི་ཡ།,ნიქოზია,ሌፍኮዚያ,ニコシア,尼科西亚,니코시아"),
- new City("3067696", "Prague", 50.08804, 14.42076, "CZ", 1165581, -9999, "Europe/Prague", "PRG,Praag,Prag,Praga,Pragae,Prago,Prague,Praha,Pràg,Prág,Prága,Prâg,Prāga,bragh,bu la ge,peulaha,prag,praga,prak,prg,puraha,Πράγα,Праг,Прагæ,Прага,פראג,براغ,پراگ,پراگا,ܦܪܓ,ปราก,པུ་ལ་ཁེ,პრაღა,ፕራግ,プラハ,布拉格,프라하"),
- new City("2950159", "Berlin", 52.52437, 13.41053, "DE", 3426354, 74, "Europe/Berlin", "BER,Beirlin,Beirlín,Berleno,Berlien,Berliin,Berliini,Berlijn,Berlim,Berlin,Berline,Berlini,Berlino,Berlyn,Berlynas,Berlëno,Berlín,Berlîn,Berlīne,Berolino,Berolinum,Birlinu,Bèrlîn,Estat de Berlin,Estat de Berlín,bai lin,barlina,beleullin,berlini,berurin,bexrlin,brlyn,perlin,Βερολίνο,Берлин,Берлін,Бэрлін,Բերլին,בערלין,ברלין,برلين,برلین,بېرلىن,ܒܪܠܝܢ,बर्लिन,বার্লিন,பெர்லின்,เบอร์ลิน,ბერლინი,ベルリン,柏林,베를린"),
- new City("223817", "Djibouti", 11.58901, 43.14503, "DJ", 623891, -9999, "Africa/Djibouti", "Cibuti,Djibouti,Djibuti,Dschibuti,Dzhibuti,Dzibuti,Dzibutis,Dżibuti,Džibuti,Džibutis,Gibuti,Gibuto,JIB,Jibouti,Jibuti,Tzimpouti,Yibuti,g'ybwty,ji bu de,jibuchi shi,jibuti,jybwty,Ĝibuto,Τζιμπουτί,Джибути,ג'יבוטי,جبوتی سٹی,جیبوتی,ジブチ市,吉布地,지부티"),
- new City("2618425", "Copenhagen", 55.67594, 12.56553, "DK", 1153615, -9999, "Europe/Copenhagen", "CPH,Cobanhavan,Copenaga,Copenaghen,Copenaguen,Copenhaga,Copenhagen,Copenhague,Copenhaguen,Copenhaguen - Kobenhavn,Copenhaguen - København,Cóbanhávan,Hafnia,Kapehngagen,Kaupmannahoefn,Kaupmannahöfn,Keypmannahavn,Kjobenhavn,Kjopenhamn,Kjøpenhamn,Kobenhamman,Kobenhaven,Kobenhavn,Kodan,Kodaň,Koebenhavn,Koeoepenhamina,Koepenhamn,Kopenage,Kopenchage,Kopengagen,Kopenhaagen,Kopenhag,Kopenhaga,Kopenhage,Kopenhagen,Kopenhagena,Kopenhago,Kopenhāgena,Kopenkhagen,Koppenhaga,Koppenhága,Kòpenhaga,Köbenhavn,Köpenhamn,Kööpenhamina,København,Københámman,ge ben ha gen,khopenheken,kopanahagana,kopenahagena,kopenahegena,kopenhagen,kwbnhaghn,kwpnhgn,qwpnhgn,Κοπεγχάγη,Капэнгаген,Копенгаген,Копенхаген,Կոպենհագեն,קופנהאגן,קופנהגן,كوبنهاغن,كوپېنھاگېن,ܟܘܦܢܗܓܢ,कोपनहागन,কোপেনহাগেন,কোপেনহেগেন,โคเปนเฮเกน,ཀའོ་པེན་ཧ་ཀེན,კოპენჰაგენი,ኮፐንሀገን,ኮፕንሀግ,コペンハーゲン,哥本哈根,코펜하겐"),
- new City("3575635", "Roseau", 15.30174, -61.38808, "DM", 16571, -9999, "America/Dominica", "Charlotte Town,Roseau,Rozo,lojo,luo suo,rozo,rwsw,Ροζό,רוסאו,روسو,ሮዞ,ロゾー,羅索,로조"),
- new City("3492908", "Santo Domingo", 18.50012, -69.98857, "DO", 2201941, -9999, "America/Santo_Domingo", "Ciudad Trujillo,SDQ,Saint Domingue,Santa Domingo,Santo Domingo,Santo Domingo City,Santo Domingo de Guzman,Santo Domingo de Guzmán,Santo Ntomin'nko,Santo-Domingo,Σάντο Ντομίνγκο,Санто-Доминго"),
- new City("2507480", "Algiers", 36.7525, 3.04197, "DZ", 1977663, -9999, "Africa/Algiers", "ALG,Al Jazair,Al-jezair,Alcher,Alge,Algeirsborg,Alger,Algeri,Algeria,Algero,Algier,Algiers,Algir,Alg·èr,Algè,Algír,Alje,Aljer,Aljir,Alse,Alxer,Alzer,Alzhir,Alzhir shaary,Alziir,Alzir,Alzira,Alzyras,Alĝero,Alžiir,Alžir,Alžyras,Alžír,Alžěr,Alžīra,Argel,Argier,Argièr,Arhel,Arjel,Caesair,Cezayir,Cäsair,Dzayer,Gorad Alzhyr,a er ji er,ala-jaza'ira,alajiyarsa,alje,aljiyars,aljiyarsa,aljyrz,aljzayr,aljzyrh,alzhiri,aruje,yaljyr,Əlcəzair,Αλγέρι,Алжир,Алжир шаары,Алҷазоир,Горад Алжыр,Ալժիր,אלג'יר,ئالجىر,ئەلجەزیرە,الجزائر,الجزائر شہر,الجزيره,الجزیره,الجیرز,ܓܙܐܐܪ,अल्जीयर्स,আলজিয়ার্স,ਅਲ-ਜਜ਼ਾਇਰ,அல்ஜியர்ஸ்,അൾജിയേഴ്സ്,แอลเจียร์,ཨཱལ་ཇི་ཡར་སི།,ალჟირი,አልጀርስ,アルジェ,阿爾及爾,알제"),
- new City("3652462", "Quito", -0.22985, -78.52495, "EC", 1399814, -9999, "America/Guayaquil", "Gorad Kita,Kitas,Kito,Kitu,Kuito,Quito,Quitu,Quitum,San Francisco de Quito,UIO,ji duo,ki to,kito,kvito,kwytw,kytw,qytw,Κίτο,Горад Кіта,Кито,Кіто,Կիտո,קיטא,קיטו,كىتو,كيتو,کوئتو,کیتو,کیٹو,क्वितो,क्वीटो,ਕੀਤੋ,กีโต,ཁེ་ཐོ།,კიტო,ኪቶ,キト,基多,키토"),
- new City("588409", "Tallinn", 59.43696, 24.75353, "EE", 394024, -9999, "Europe/Tallinn", "Castrum Danorum,Gorad Talin,Kallinn,Kolyvan,Raeaeveli,Reval,Revel,Revel',Rääveli,TLL,Taillinn,Talin,Talinas,Talini,Talino,Talins,Tallin,Tallin osh,Tallina,Tallinn,Tallinna,Talín,Tàllin,ta lin,talin,talina,tallin,tallina,tallyn,talyn,tarin,thallin n,Ταλίν,Ταλιν,Ταλλίν,Горад Талін,Талин,Таллин,Таллин ош,Таллинн,Таллінн,Տալլին,טאלין,تاللىن,تالين,تالین,تاڵین,ٹالن,तालिन,ताल्लिन,তাল্লিন,ਤਾਲਿਨ,தாலின்,ടാലിൻ,ทาลลินน์,ཏཱལ་་ལིན།,ტალინი,ታሊን,タリン,塔林,탈린"),
- new City("360630", "Cairo", 30.06263, 31.24967, "EG", 7734614, -9999, "Africa/Cairo", "Al Qahirah,Al Qāhirah,CAI,Caire,Cairo,Cairo - alqahrt,Cairo - القاهرة,Cairu,Cairus,Caïro,El Caire,El Cairo,El Kahira,El Kahirah,El-Qahira,El-Qâhira,Il Cairo,Kaherah,Kahira,Kahirae,Kahire,Kahirä,Kair,Kaira,Kairas,Kairo,Kairó,Kajro,Kaíró,Kaïro,Káhira,Le Caire,Lo Cayiro,Lungsod ng Cairo,Masr,Misr,Qahirə,alqahrt,kai luo,kailo,kairo,keyro,khiro,qahrh,qhyr,Ël Cairo,Ël Càiro,Κάιρο,Каир,Каиро,Кайро,Каїр,קהיר,القاهرة,قاهره,قاھىرە,قاہرہ,கெய்ரோ,ไคโร,ཁ་ཡི་རོ,ქაირო,ካይሮ,カイロ,开罗,카이로"),
- new City("2462881", "Laâyoune / El Aaiún", 27.16224, -13.20315, "EH", 188084, -9999, "Africa/El_Aaiun", "Aaium,Aaiun,Aaiún,Aiun,Ajuno,Al Ayoun,Al-Aaiun,Al-Ayun,Al-Ujun,EUN,Ehl'-Ajun,Ejbei Uad el Aabd,El Aaiun,El Aaiún,El Aium,El Aiun,El Aiún,El Ajun,El Ayun,El-Aaiun,El-Aaiún,La'Youn,Laayoune,Laâyoune,La’Youn,O Aiún - العيون,a you en,aiun,el-ayun,Ел Ајун,Эль-Аюн,العيون,العیون,アイウン,阿尤恩,엘아윤"),
- new City("343300", "Asmara", 15.33805, 38.93184, "ER", 563930, -9999, "Africa/Asmara", "ASM,Asmara,Asmaro,Asmehra,Asmera,Aszmara,Gorad Asmara,a si ma la,asamara,aseumala,asmara,asmera,asmrh,asmrt,asumara,yasmara,Əsməra,Ασμάρα,Асмара,Асмэра,Асмєра,Горад Асмара,Ասմարա,אסמרה,أسمرة,ئاسمارا,اسمارا,اسمره,अस्मारा,ਅਸਮਾਰਾ,அஸ்மாரா,അസ്മാറ,แอสมารา,ཨཱ་སི་མི་ར།,ასმერა,አስመራ,ኣስመራ,アスマラ,阿斯馬拉,아스마라"),
- new City("3117735", "Madrid", 40.4165, -3.70256, "ES", 3255944, -9999, "Europe/Madrid", "Gorad Madryd,La Villa y Corte,Los Madriles,Lungsod ng Madrid,MAD,Madrid,Madrid osh,Madridas,Madride,Madridi,Madrido,Madril,Madrit,Madrite,Madryt,Madríd,Madrîd,Magerit,Maidrid,Mairil,Makelika,Matritum,Sanchinarro,ma de li,madeulideu,madorido,madorido shi,madrid,madrida,madridi,madryd,matrit,mdryd,mydrd,Μαδρίτη,Горад Мадрыд,Мaдрид,Мадрид,Мадрид ош,Мадрід,Մադրիդ,מאדריד,מדריד,مادرىد,مادرید,مدريد,میدرد,میڈرڈ,مەدرید,ܡܕܪܝܕ,मद्रिद,मद्रिद्,माद्रिद,মাদ্রিদ,ମାଡ୍ରିଦ,மத்ரித்,ಮಡ್ರಿಡ್,മാഡ്രിഡ്,มาดริด,མ་ད་རིད།,မဒရစ်မြို့,მადრიდი,ማድሪድ,マドリード,マドリード市,馬德里,马德里,마드리드"),
- new City("344979", "Addis Ababa", 9.02497, 38.74689, "ET", 2757729, -9999, "Africa/Addis_Ababa", "ADD,Addis Ababa,Addis Abbaba,Addis Abeba,Addis-Abeba,Addis-Abebae,Addisz-Abeba,Adis Abeba,Adis-Abebo,Adisabeba,Adís Abeba,Antis Ampempa,Neanthopolis,a di si a bei ba,adisa ababa,adiseuababa,adisuabeba,adys ababa,Ādīs Ābeba,Αντίς Αμπέμπα,Аддис-Абебæ,Аддис-Абеба,Адис Абеба,Ադիս Աբեբա,אדיס אבבה,آدیس آبابا,أديس أبابا,ئەددىس -ئەبىبە,अदिस अबाबा,አዲስ አበባ,アディスアベバ,阿迪斯阿貝巴,아디스아바바"),
- new City("658225", "Helsinki", 60.16952, 24.93545, "FI", 558457, -9999, "Europe/Helsinki", "Elsin'ki,Elzinki,Gel'sinki,Gorad Khel'sinki,HEL,Heilsinci,Heilsincí,Hel'sinki,Helsingfors,Helsingi,Helsingia,Helsinki,Helsinkis,Helsinkium,Helsinko,Helsinky,Helsinqui,Helsinquia,Helsset,Helsínquia,Helsînkî,Hèlsinki,Khel'sinki,Khel'sinki osh,Khelsinki,Khelzinki,Lungsod ng Helsinki,Xelsinki,Xélsinki,Yelsinki,hailasiki,he er xin ji,helasinki,helcinki,helsingki,helsinki,herushinki,hlsnky,hlsnqy,hlsynky,hlsynqy,hylsynky,Èlzinki,Ħelsinki,Ελσίνκι,Гельсінкі,Горад Хельсінкі,Хелзинки,Хелсинки,Хельсинки,Хельсинки ош,Ҳелсинкӣ,Հելսինկի,הלסינקי,העלסינקי,هلسنكي,هلسینکی,هيلسينكى,ھێلسینکی,ہلسنکی,ہیلسنکی,ܗܠܣܢܩܝ,हेलसिंकी,हेल्सिन्कि,হেলসিঙ্কি,ਹੈਲਸਿੰਕੀ,ஹெல்சின்கி,ಹೆಲ್ಸಿಂಕಿ,ഹെൽസിങ്കി,เฮลซิงกิ,ཧེལ་སིན་ཀི།,ဟယ်လ်ဆင်ကီမြို့,ჰელსინკი,ሄልሲንኪ,Ḥélsinki,ヘルシンキ,赫尔辛基,헬싱키"),
- new City("2198148", "Suva", -18.14161, 178.44149, "FJ", 77366, -9999, "Pacific/Fiji", "Gorad Suva,SUV,Souba,Souva,Sufa,Suva,Suva City,Suvae,Suvo,Suwa,cuva,su wa,suba,subha,suva,suwa,swbh,swfa,swwa,Σούβα,Горад Сува,Сувæ,Сува,Սուվա,סובה,سوفا,سووا,सुवा,সুভা,ਸੂਵਾ,சுவா,ซูวา,སུ་ཝ།,სუვა,ሱቫ,スバ,蘇瓦,수바"),
- new City("3426691", "Stanley", -51.7, -57.85, "FK", 2213, -9999, "Atlantic/Stanley", "Port Stanley,Port Stenli,Puerto Archentinas/Stenlis,Puerto Argentino/Stanley,Stanley,Stanley Harbour,Stenlis,stnly,sutanre,sutanri,Порт Стенли,סטנלי,スタンリー,スタンレー"),
- new City("2081986", "Palikir - National Government Center", 6.92477, 158.16109, "FM", 0, 90, "Pacific/Pohnpei", "Palakir,Palikir,Palikiras,Palirik,Pallikir,pa li ji er,pa li kexr,pallikileu,parikiru,plyqyr,Παλιρίκ,Паликир,Պալիկիր,פליקיר,ปาลิเกอร์,ፓሊኪር,パリキール,帕利基爾,팔리키르"),
- new City("2611396", "Tórshavn", 62.00973, -6.77164, "FO", 13200, -9999, "Atlantic/Faroe", "Gorad Torskhaun,Havn,THorshoefn,THunreshaefen,Thori Portus,Thorshavn,Torschavn,Torsgavn,Torshamn,Torshaunas,Torshavn,Torshgavn,Torshkhavn,Torskhavn,Tourshavna,Touršhavna,Tórshavn,thxrs hea n,toleuseuhaun,tosuhaun,tuo er si gang,twrshafn,twshhawn,Þunreshæfen,Þórshöfn,Τόρσχαβν,Горад Торсхаўн,Торсгавн,Торсхавн,Торшгавн,Торшхавн,Տորսհավն,טורסהאבן,تورسهافن,تورشھاون,توشهاون,تۆسھاون,ทอร์สเฮาน์,ტორსჰავნი,トースハウン,托爾斯港,토르스하운"),
- new City("2988507", "Paris", 48.85341, 2.3488, "FR", 2138551, -9999, "Europe/Paris", "Baariis,Bahliz,Gorad Paryzh,Lungsod ng Paris,Lutece,Lutetia,Lutetia Parisorum,PAR,Pa-ri,Paarys,Palika,Paname,Pantruche,Paraeis,Paras,Pari,Paries,Parigge,Pariggi,Parighji,Parigi,Pariis,Pariisi,Parij,Parijs,Paris,Parisi,Parixe,Pariz,Parize,Parizh,Parizh osh,Parizh',Parizo,Parizs,Pariž,Parys,Paryz,Paryzius,Paryż,Paryžius,Paräis,París,Paríž,Parîs,Parĩ,Parī,Parīze,Paříž,Páras,Párizs,Ville-Lumiere,Ville-Lumière,ba li,barys,pairisa,pali,pari,paris,parys,paryzh,perisa,pryz,pyaris,pyarisa,pyrs,Παρίσι,Горад Парыж,Париж,Париж ош,Парижь,Париз,Парис,Паріж,Փարիզ,פאריז,פריז,باريس,پارىژ,پاريس,پاریس,پیرس,ܦܐܪܝܣ,पॅरिस,पेरिस,पैरिस,প্যারিস,ਪੈਰਿਸ,પૅરિસ,பாரிஸ்,పారిస్,ಪ್ಯಾರಿಸ್,പാരിസ്,ปารีส,ཕ་རི།,ပါရီမြို့,პარიზი,ፓሪስ,ប៉ារីស,パリ,巴黎,파리"),
- new City("2399697", "Libreville", 0.39241, 9.45356, "GA", 578156, -9999, "Africa/Libreville", "LBV,Librevil,Librevil',Librevilis,Libreville,Liburvil,Limprebil,li bo wei er,libeuleubil,lybrwwyl,lybrwyl,Λιμπρεβίλ,Либревиль,Либървил,Լիբրևիլ,ליברוויל,لیبرویل,ሊብረቪል,利伯维尔,리브르빌"),
- new City("2643743", "London", 51.50853, -0.12574, "GB", 7556900, -9999, "Europe/London", "City of London,Gorad Londan,ILondon,LON,Lakana,Landen,Ljondan,Llundain,Londain,Londan,Londar,Londe,Londen,Londinium,Londino,Londn,London,London City,Londona,Londonas,Londoni,Londono,Londonu,Londra,Londres,Londrez,Londri,Londye,Londyn,Londýn,Lonn,Lontoo,Loundres,Luan GJon,Lunden,Lundra,Lundun,Lundunir,Lundúnir,Lung-dung,Lunnainn,Lunnin,Lunnon,Luân Đôn,Lùng-dŭng,Lākana,Lůndůn,Lọndọnu,Ranana,Rānana,The City,ilantan,landan,landana,leondeon,lndn,london,londoni,lun dui,lun dun,lwndwn,lxndxn,rondon,Łondra,Λονδίνο,Горад Лондан,Лондан,Лондон,Лондонъ,Лёндан,Լոնդոն,לאנדאן,לונדון,لندن,لوندون,لەندەن,ܠܘܢܕܘܢ,लंडन,लंदन,लण्डन,लन्डन्,লন্ডন,લંડન,ଲଣ୍ଡନ,இலண்டன்,లండన్,ಲಂಡನ್,ലണ്ടൻ,ලන්ඩන්,ลอนดอน,ລອນດອນ,ལོན་ཊོན།,လန်ဒန်မြို့,ლონდონი,ለንደን,ᎫᎴ ᏗᏍᎪᏂᎯᏱ,ロンドン,伦敦,倫敦,런던"),
- new City("3579925", "Saint George's", 12.05644, -61.74849, "GD", 7500, 6, "America/Grenada", "Fort Royal,Georgetown,Grenada City,Lewis,Port Louis,Port Royal,Saint George,Saint George's,Saint George.s,Saint-Georges,Sent Dzordzas,Sent Džordžas,Sent Tzortzes,Sent-Dzhorzhes,St Georges,St. George's,seinteujojiseu,sentojojizu,snt g'wrg',Σεντ Τζόρτζες,Сент-Джоржес,סנט ג'ורג',セントジョージズ,세인트조지스"),
- new City("611717", "Tbilisi", 41.69411, 44.83368, "GE", 1049498, -9999, "Asia/Tbilisi", "Gorad Tbilisi,TBILISI,TBS,Tbilis,Tbilisi,Tbilisi - tbilisi,Tbilisi - თბილისი,Tbilisi osh,Tbilisis,Tbiliso,Tbilissi,Tbilisy,Tbiliszi,Tbilsi,Tblisi,Thbilisi,Tibilisi,Tiblisi,Tibîlîsî,Tiflis,Tiphlida,Tpilisi,Triphelis,Ttuplis,Tíblisi,Tíflis,Tıflis,di bi li si,karti,tbilisi,tblys,tblysy,tbylysy,teubillisi,tfls,tflys,thbi li si,thbilisi,tipilici,tobirishi,Τιφλίδα,Горад Тбілісі,ТБИЛИСИ,Тбилис,Тбилиси,Тбилиси ош,Тбилисӣ,Тбілісі,Ттуплис,Қарҭ,Թբիլիսի,טביליסי,تبليسي,تبلیس,تبلیسی,تبىلىسى,تفلیس,طفلس,ܛܒܝܠܝܣܝ,त्बिलिसी,थ्बिलीसी,তিবি‌লিসি,திபிலீசி,ทบิลิซิ,ཁྲེ་བྷི་ལི་སི།,თბილისი,ქართი,ትብሊሲ,トビリシ,第比利斯,트빌리시"),
- new City("3382160", "Cayenne", 4.93333, -52.33333, "GF", 61550, -9999, "America/Cayenne", "CAY,Caiena,Caienna,Cajen-a,Cajena,Cayena,Cayene,Cayenne,Gorad Kaena,Kaenna,Kagien,Kajen,Kajena,Kajenna,Kajennae,Kayen,Kayene,kai yun,kaien'nu,kaiyana,kayen,kayena,kayn,kayyn,Καγιέν,Горад Каена,Кайен,Кайеннæ,Кайенна,Каєнна,Кајена,קאיין,كايين,کاین,कायेन,ਕੈਯਨ,กาแยน,კაიენა,カイエンヌ,開雲,카옌"),
- new City("3042287", "Saint Peter Port", 49.45981, -2.53527, "GG", 16488, -9999, "Europe/Guernsey", "GCI,Saint Peter Port,Saint Pierre Port,Saint-Pierre-Port,Sent Piter Port,Sent-Piter-Port,St Peter Port,St. Peter Port,Сент Питер Порт,Сент-Питер-Порт,セント・ピーター・ポート"),
- new City("2306104", "Accra", 5.55602, -0.1969, "GH", 1963264, -9999, "Africa/Accra", "ACC,Aakra,Aakrá,Accra,Acra,Akkra,Akkrae,Akra,Akrao,Gorad Akra,Nkran,a ke la,akara,akeula,akra,akura,xak kra,yakra,΄Aκκρα,Άκκρα,Аккрæ,Аккра,Акра,Горад Акра,Ակրա,אקרא,אקרה,آکرا,أكرا,ئاکرا,اكرا,اکرا,عکرہ,आक्रा,ਅਕਰਾ,ଆକ୍ରା,அக்ரா,അക്ര,อักกรา,ཨ་ཁ་ར།,အက်ခရာမြို့,აკრა,አክራ,アクラ,阿克拉,아크라"),
- new City("2411585", "Gibraltar", 36.14474, -5.35257, "GI", 26544, -9999, "Europe/Gibraltar", "Calpe,Cebelitarik,Cebelitarık,Djibraltar,GIB,Gibbilterra,Gibilterra,Gibraltar,Gibraltaras,Gibraltaro,Gibraltár,Gíbraltar,Kamaka,Xibraltar,Xibraltar - Gibraltar,gybrltr,jibeulolteo,jiburarutaru,mhmyt jbl tarq,zhi bu luo tuo,Ĝibraltaro,Γιβραλτάρ,Гибралтар,Ґібралтар,גיברלטר,جبل‌الطارق,محمية جبل طارق,ジブラルタル,直布罗陀,지브롤터"),
- new City("3421319", "Nuuk", 64.18347, -51.72157, "GL", 14798, 5, "America/Godthab", "GOH,Godhopa,Godthaab,Godthab,Godthåb,Gorad Nuk,Nououk,Nuk,Nuka,Nukas,Nuko,Nuuk,Nuuk (Godthab),Nuuk (Godthåb),Nūka,nu ke,nuk,nuka,nukeu,nuku,nwk,nwʼwq,Νουούκ,Горад Нук,Нук,Нуук,Нүүк,Նուուկ,נואוק,نوك,نوک,नूक,ਨੂਕ,ନୁକ,นุก,ნუუკი,ヌーク,努克,누크"),
- new City("2413876", "Banjul", 13.45274, -16.57803, "GM", 34589, -9999, "Africa/Banjul", "BJL,Bandzul,Bandzulis,Bandżul,Bandžulis,Banjul,Banjulo,Banzhul,Banĵulo,Bathurst,Mpanzoul,ban zhu er,banjul,banjuru,banjwl,bng'wl,Μπανζούλ,Банжул,Банџул,Բանջուլ,בנג'ול,بانجول,ባንጁል,バンジュール,班珠尔,班珠爾,반줄"),
- new City("2422465", "Conakry", 9.53795, -13.67729, "GN", 1767200, -9999, "Africa/Conakry", "CKY,Conacri,Conakry,Konakri,Konakrio,Konakris,Konakry,ke na ke li,konakeuli,konakuri,Κόνακρι,Конакри,קונאקרי,コナクリ,科納克里,코나크리"),
- new City("3579732", "Basse-Terre", 15.99854, -61.72548, "GP", 11472, -9999, "America/Guadeloupe", "BBR,Bas Ter,Bas Teras,Bas-Ter,Bassa-Terra,Basse Terre,Basse-Terre,Bâssa-Tèrra,Gorad Basa-Tehreh,ba si te er,base-tera,baseuteleu,basuteru,Μπας-Τερ,Бас Тер,Бас-Тер,Горад Баса-Тэрэ,באס טר,बासे-तेर,บัส-แตร์,ბას-ტერი,バステール,巴斯特尔,바스테르"),
- new City("2309527", "Malabo", 3.75, 8.78333, "GQ", 155963, -9999, "Africa/Malabo", "Ciudad de Malabo,Malaba,Malabas,Malabo,Malampo,Port Clarence,Rev Malebo,SSG,Santa Isabel,ma la bo,malabw,mallabo,marabo,Μαλάμπο,Малабо,מלאבו,مالابو,ማላቦ,マラボ,馬拉博,말라보"),
- new City("264371", "Athens", 37.97945, 23.71622, "GR", 729137, 70, "Europe/Athens", "ATH,Afina,Afini,Afiny,An Aithin,Ateena,Atehny,Aten,Atena,Atenai,Atenas,Atenas - Athena,Atenas - Αθήνα,Atene,Atenes,Ateni,Ateno,Atenoj,Ateny,Athen,Athena,Athenae,Athenai,Athene,Athenes,Athens,Atheny,Athina,Athinai,Athinia,Athènes,Athén,Athénes,Athény,Athína,Athínai,Atina,Atény,Atēnas,Atėnai,Aþena,Kota Athena,Lungsod ng Athina,Lungsod ng Athína,atene,atene si,ateni,athensa,athyna,atn,etens,xethens,ya dian,Αθήνα,Αθήναι,Αθηνα,Αθηναι,Атина,Атэны,Афины,Афіни,Аѳины,Աթենք,אתונה,آتن,أثينا,ئافېنا,ܐܬܝܢܐ,अथेन्स,ஏதென்ஸ்,เอเธนส์,ათენი,Ἀθῆναι,アテネ,雅典,아테네,아테네 시"),
- new City("3426466", "Grytviken", -54.28111, -36.5092, "GS", 2, -9999, "Atlantic/South_Georgia", "Grjutviken,Grytviken,Грютвикен"),
- new City("3598132", "Guatemala City", 14.64072, -90.51327, "GT", 994938, -9999, "America/Guatemala", "Cidade da Guatemala,Citta del Guatemala,Città del Guatemala,Ciudad Guatemala,Ciudad de Guatemala,Ciutat de Guatemala,GUA,Guate,Guatemala,Guatemala City,Guatemala Hiria,Guatemala by,Guatemala la Nueva,Guatemala-Stadt,Guatemala-Urbo,Guatemala-stad,Gvatemala,Gvatemalurbo,Gwatemala,New Guatemala,Nueva Guatemala,Nueva Guatemala de la Asuncion,Nueva Guatemala de la Asunción,Pole tes Gouatemalas,Santiago de Guatimala,gua de ma la shi,guatemarashiti,gwatemalla si,kawtemalasiti,mdynt ghwatymala,shhr gwatmala,Πόλη της Γουατεμάλας,Гватемала,גואטמלה סיטי,גוואטמלה סיטי,شهر گواتمالا,مدينة غواتيمالا,กัวเตมาลาซิตี,グアテマラシティ,瓜地馬拉市,과테말라 시"),
- new City("4044012", "Hagåtña", 13.47567, 144.74886, "GU", 1051, 3, "Pacific/Guam", "Agan'ja,Agana,Agana - Hagatna,Agana -1998,Agaña,Agaña - Hagatña,Akashi - JP renamed WW2,Hagatna,Hagåtña,a jia ni ya,hagania,hagasnya,Аганья,ハガニア,阿加尼亚,하갓냐"),
- new City("2374775", "Bissau", 11.86357, -15.59767, "GW", 388028, -9999, "Africa/Bissau", "Bisao,Bisau,Bisau - Bissau,Bisauo,Bisaŭo,Bissao,Bissau,Bissáu,Mpissaou,OXB,Sao Jose de Bissau,São José de Bissáu,bi shao,bis'sa'u,bisau,bsaw,bysayw,Μπισσάου,Бисао,Бисау,ביסאו,بساؤ,بیسائو,বিস্সাউ,ቢሳው,ビサウ,比绍,비사우"),
- new City("3378644", "Georgetown", 6.80448, -58.15527, "GY", 235017, -9999, "America/Guyana", "Demerara,Dzhordzhtaun,Dzordztaun,Dzordztauna,Dzordztaunas,Džordžtauna,Džordžtaunas,GEO,Georgetown,Georgetown i Guyana,Georgiopolis,Gorad Dzhordzhtaun,Gorgtauno,Jojton,Jòjtòn,Tzortztaoun,cxrc thawn,jarajata'una,jarjata'una,jojitaun,jorjata'una,jorjtavun,jwrj tawn,jwrj twghn,qiao zhi dui,qiao zhi dun,Ĝorĝtaŭno,Τζορτζτάουν,Τζώρτζταουν,Џорџтаун,Горад Джорджтаўн,Джорджтаун,ג'ורג'טאון,جارج ٹاؤن,جورج تاون,جورج توغن,جورج‌تاو,جورج‌تاون,जॉर्जटाउन,ਜਾਰਜਟਾਊਨ,ଜର୍ଜଟାଉନ,ஜோர்ஜ்டவுண்,จอร์จทาวน์,ཅོར་ཅི་ཐོན།,ჯორჯტაუნი,ጆርጅታውን,ジョージタウン,乔治敦,조지타운"),
- new City("1819729", "Hong Kong", 22.28552, 114.15769, "HK", 7012738, -9999, "Asia/Hong_Kong", "Gonkong,HKG,Hong Kong,Victoria,xiang gang,Гонконг,香港"),
- new City("3600949", "Tegucigalpa", 14.0818, -87.20681, "HN", 850848, -9999, "America/Tegucigalpa", "Gorad Tehgusigal'pa,TGU,Tegousigoualpa,Tegucigalpa,Tegucigalpo,Tegucigucigalpa,Tegusigal'pa,Tegusigalpa,Teguzigalpa,Tenkousinkalpa,Teocuitlapan,Tequsiqalpa,Teōcuitlapan,Tègucigalpa,de gu si jia ba,tegushigarupa,tegusigalapa,tegusigalpa,tekusikalpa,tgwsygalpa,tgwsyglph,tyjwsyjalba,Τεγκουσιγκάλπα,Горад Тэгусігальпа,Тегусигалпа,Тегусигальпа,Тегусігальпа,Տեգուսիգալպա,טגוסיגלפה,تيجوسيجالبا,تگوسیگالپا,ٹیگوسیگلپا,तेगुसिगल्पा,ਤੇਗੂਸੀਗਾਲਪਾ,ടെഗൂസിഗാൽപ,เตกูซิกัลปา,ཐེ་གུ་སི་གེ་པ།,ტეგუსიგალპა,ቴጉሲጋልፓ,テグシガルパ,德古斯加巴,테구시갈파"),
- new City("3186886", "Zagreb", 45.81444, 15.97798, "HR", 698966, -9999, "Europe/Zagreb", "Agram,Andautonia,Gorad Zagrab,Lungsod ng Zagreb,Sagrab,Sagreb,Sagwzlwgbouh,Sakreb,Ságrab,ZAG,Zabrag,Zabreg,Zagabbria,Zagabria,Zagavria,Zagrab,Zagrabia,Zagreb,Zagreba,Zagrebas,Zagrebi,Zagrebo,Zagrep,Zagrzeb,Zagrèb,Zagréb,Zagàbria,Zahreb,Zankremp,Zaqreb,Zágráb,Záhreb,Záhřeb,cakirep,jagareba,jageulebeu,jhagreba,sa ge lei bu,sa kerb,zagaraba,zagrb,zagrebi,zagurebu,zghrb,zghryb,Żagreb,Ζάγκρεμπ,Горад Заграб,Загреб,Զագրեբ,זאגרב,זאגרעב,زاگرب,زاگرێب,زغرب,زغریب,झाग्रेब,জাগরেব,ਜ਼ਾਗਰਬ,சாகிரேப்,ซาเกร็บ,ཛག་རེབ།,ზაგრები,ዛግሬብ,ザグレブ,萨格勒布,Ꙁагрєбъ,자그레브"),
- new City("3718426", "Port-au-Prince", 18.53917, -72.335, "HT", 1234742, -9999, "America/Port-au-Prince", "Gorad Port-o-Prehns,Port au Prince,Port o Prens,Port o Prensas,Port-au-Prince,Port-o-Prens,Port-o-Prins,Porto Principe,Porto Príncipe,Portoprensa,Portoprinco,Portus Principis,Potoprens,Puerto Principe,Puerto Príncipe,Pòtoprens,Ville de Port-au-Prince,bwrt aw brans,poleutopeulaengseu,porata-o-prainsa,port-o-pirins,porta-a-prinsa,porta-au-prinsa,porta-o-prinsa,porutopuransu,pwrtw prns,tai zi gang,Πορτ-ο-Πρενς,Горад Порт-о-Прэнс,Порт о Пренс,Порт-о-Пренс,Պորտ-օ-Պրենս,פורט או פרינס,פורט-או-פרנס,بورت أو برانس,پورتو پرنس,پورٹ او پرنس,पोर्ट-ऑ-प्रिंस,पोर्ट-औ-प्रिन्स,পোর্ট-অ-প্রিন্স,ਪੋਰਤ-ਓ-ਪ੍ਰੈਂਸ,போர்ட்-ஓ-பிரின்ஸ்,ปอร์โตแปรงซ์,པོ་རོ་ཊི་ཨའུ་པི་རིན་སི།,პორტ-ო-პრენსი,ፖርቶፕሪንስ,ポルトープランス,太子港,포르토프랭스"),
- new City("3054643", "Budapest", 47.49801, 19.03991, "HU", 1696128, -9999, "Europe/Budapest", "BUD,Boedapes,Boedapest,Boudapes,Boudapeste,Boudapès,Budaipeist,Budapescht,Budapeshha,Budapesht,Budapesht osh,Budapest,Budapesta,Budapestas,Budapeste,Budapesti,Budapestinum,Budapesto,Budapeszt,Budapeŝto,Budapeşt,Budapeşte,Budapešt,Budapešta,Budapeštas,Budapešť,Budapèst,Budapésht,Budimpeshta,Budimpesta,Budimpešta,Bùdapest,Bùdapeszt,Búdaipeist,Búdapest,Gorad Budapesht,bu da pei si,budapaisata,budapeseuteu,budapesrr,budapest,budapesta,budapesuto,bwdabst,bwdabyst,bwdapst,bwdpst,putapest,Βουδαπέστη,Будапешт,Будапешт ош,Будапеща,Будимпешта,Горад Будапешт,Բուդապեշտ,בודאפעשט,בודפשט,بودابست,بودابيست,بوداپست,بوداپێست,بوډاپسټ,बुडापेस्ट,बुदापेस्त,বুদাপেস্ট,ਬੁਦਾਪੈਸਤ,બુડાપેસ્ટ,ବୁଦାପେଷ୍ଟ,புடாபெஸ்ட்,ಬುಡಾಪೆಸ್ಟ್,ബുഡാപെസ്റ്റ്,บูดาเปสต์,བུ་ད་ཕེ་སིད།,ဗူးဒပက်မြို့,ბუდაპეშტი,ቡዳፔስት,ブダペスト,布达佩斯,부다페스트"),
- new City("1642911", "Jakarta", -6.21462, 106.84513, "ID", 8540121, -9999, "Asia/Jakarta", "Batavia,Cakarta,D'akarta,Daerah Khusus Ibukota Jakarta,Djakarta,Djogkarta,Dki Jakarta,Dzakarta,Dzhakarta,Dzhakartae,Dżakarta,Džakarta,Gakarto,Giacarta,Gorad Dzhakarta,Iacarta,Iacárta,JKT,Jacarta,Jakarta,Jogkarta,Nga-ka-that Su-tu Thit-khi,Ngâ-kâ-tha̍t Sú-tû Thi̍t-khî,Tzakarta,Xacarta,Xhakarta,Yajgyadaz,Yakarta,Zhakarta,cakarta,g'qrth,jakaleuta,jakarata,jakarta,jakartta,jakaruta,jkarta,ya jia da,Ĝakarto,Τζακάρτα,Џакарта,Горад Джакарта,Джакартæ,Джакарта,Дьакарта,Жакарта,Ջակարտա,ג'קרטה,דזשאקארטא,جاكارتا,جاکارتا,جکارتا,جکارتہ,जकार्ता,জাকার্তা,ਜਕਾਰਤਾ,જાકાર્તા,ଜାକର୍ତା,ஜகார்த்தா,జకార్తా,ಜಕಾರ್ತ,ജക്കാർത്ത,จาการ์ตา,ཊ་ཁར་ཏ།,ဂျကာတာမြို့,ჯაკარტა,ጃካርታ,ចាការតា,ジャカルタ,雅加达,자카르타"),
- new City("2964574", "Dublin", 53.33306, -6.24889, "IE", 1024027, -9999, "Europe/Dublin", "Baile Atha Cliath,Baile Átha Cliath,Ciuda de Dublin,Ciudá de Dublín,DUB,Dablin,Diblin,Difelin,Divlyn,Doublino,Dublin,Dublin city,Dublina,Dublinas,Dublini,Dublino,Dublinu,Dublín,Dublîn,Dueblin,Dulenn,Dulyn,Dyflinn,Düblin,Eblana,Gorad Dublin,dabalina,dablin,dablina,daburin,dbln,dblyn,deobeullin,dou bai lin,dublini,dwblyn,taplin,Δουβλίνο,Горад Дублін,Даблин,Дублин,Дублін,Дъблин,Դուբլին,דבלין,דובלין,دبلن,دوبلين,دوبلین,دۇبلىن,ڈبلن,ډبلن,ܕܒܠܢ,डब्लिन,दब्लिन,ডাবলিন,ਡਬਲਿਨ,டப்லின்,ಡಬ್ಲಿನ್,ഡബ്ലിൻ,ดับลิน,དུབ་ལིན།,ဒပ်ဗလင်မြို့,დუბლინი,ደብሊን,ダブリン,都柏林,더블린"),
- new City("3042237", "Douglas", 54.15, -4.48333, "IM", 26218, -9999, "Europe/Isle_of_Man", "Daglas,Daglasa,Daglasas,Doolish,Douglas,Douglas pa Isle of Man,Douglas på Isle of Man,Douglas, Isle of Man,Dubh Lios,Duglas,Duqlas,Gorad Duglas,Ntanklas,Port Douglas,daglasa,dagurasu,daklas,dao ge la si,deogeulleoseu,duglasi,dwglas,Ντάγκλας,Горад Дуглас,Даглас,Дуглас,Дъглас,דאגלס,دوگلاس,ڈگلس,डग्लस,ดักลาส,დუგლასი,ダグラス,道格拉斯,더글러스"),
- new City("1261481", "New Delhi", 28.63576, 77.22445, "IN", 317797, -9999, "Asia/Kolkata", "Dellium Novum,Dilli,Dillí,N'ju-Deli,Neo Delchi,Neu-Delhi,Nev Deli,New Delhi,New Dilli,Nju Delkhi,Nov-Delhio,Nova Delhi,Nova Deli,Nova Deli - na'i dilli,Nova Deli - नई दिल्ली,Nova-Delhi,Nove Dilli,Nové Dillí,Nueba Deli,Nueva Delhi,Nuova Delhi,Nyja Deli,Nyu Deli,Nòva Delhi,Nýja Delí,Yeni Delhi,na'i dilli,naya dilli,niu-deli,niwde li,nyudelli,nyuderi,nyw dlhy,nywdlhy,putu tilli,xin de li,Νέο Δελχί,Њу Делхи,Нев Дели,Нью-Дели,Նյու Դելի,ניו דלהי,نيودلهي,नई दिल्ली,নয়া দিল্লী,புது தில்லி,นิวเดลี,ནེའུ་དིལ་ལིའི,ნიუ-დელი,ኒው ዴሊ,ニューデリー,新德里,뉴델리"),
- new City("98182", "Baghdad", 33.34058, 44.40088, "IQ", 5672513, -9999, "Asia/Baghdad", "BGW,Bagda,Bagdad,Bagdadas,Bagdado,Bagdat,Bagdate,Bagdatum,Bagdod,Bagdá,Bagdád,Baghdad,Baghdād,Bağdad,Bağdat,Beghdad,Bexda,Lungsod ng Baghdad,ba ge da,bagadada,bageudadeu,bagudado,bghdad,bەghdad,paktat,Βαγδάτη,Багдад,Бағдод,Բաղդադ,בגדאד,بغداد,بەغداد,ܒܓܕܐܕ,बगदाद,பக்தாத்,པ་ག་ཏ,ባግዳድ,バグダード,巴格达,바그다드"),
- new City("112931", "Tehrān", 35.69439, 51.42151, "IR", 7153309, -9999, "Asia/Tehran", "THR,Taekhran,Tahran,Techerane,Teera,Teerao,Teerã,Teerão,Tegeran,Teheran,Teherana,Teheranas,Teherano,Teherán,Teherāna,Tehran,Tehrano,Tekheran,Téhéran,de hei lan,teharan,teharana,tehelan,teheran,tehran,teirani,thran,thrn,thrwn,tihiran,tihran,Τεχεράνη,Тæхран,Тегеран,Техеран,Теҳрон,Թեհրան,טהראן,טהרן,تهران,تهرون,تِهران,تِهِرَن,تہران,طهران,ܛܗܪܐܢ,तेहरान,তেহরান,தெஹ்ரான்,เตหะราน,ཏེ་ཧི་རན​།,თეირანი,ቴህራን,テヘラン,德黑兰,테헤란"),
- new City("3413829", "Reykjavík", 64.13548, -21.89541, "IS", 113906, -9999, "Atlantic/Reykjavik", "Gorad Rehjk'javik,REK,Recwic,Refkiavik,Reiciavicia,Reicivic,Reikiavik,Reikiavike,Reikjavik,Reikjavika,Reikjavikas,Reikjavīka,Reiquiavik,Rejk'avik,Rejk'javik,Rejkijavik,Rejkjavik,Rejkjaviko,Rekyavik,Reykiabik,Reykiavica,Reykjavik,Reykjavík,Reykjawik,Reykyabik,Reykyavik,Rèkyavik,Réicivíc,Rēcwīc,kartuli,lei ke ya wei ke,leikyabikeu,re'ikiyabhika,reikyavu~iku,rekavik,rekh ya wik,reki'avika,rekjabhika,rekjavika,rekyavika,reyikyavik,reykyavik,rykjawk,rykyafyk,rykyawk,rykyawyk,Ρέυκιαβικ,Ρευκιαβικ,Горад Рэйк'явік,Рейк'явік,Рейкиявик,Рейкьявик,Рейкявик,Рејкјавик,Ռեյկյավիկ,רייקיאוויק,רעקיאוויק,ريكيافيك,ریکجاوک,ریکیاوک,ریکیاویک,رېيكياۋىك,ڕێکیاڤیک,रेक्जाविक,रेक्याविक,রেইকিয়াভিক,ਰੇਕਿਆਵਿਕ,ରେକ୍ଜାଭିକ,ரெய்க்யவிக்,రేకవిక్,റെയിക്യാവിക്,เรคยาวิก,རེཀ་ཇ་བིཀ།,რეიკიავიკი,ქართული,ሬይኪያቪክ,レイキャヴィーク,雷克亞維克,雷克雅維克,레이캬비크"),
- new City("3169070", "Rome", 41.89474, 12.4839, "IT", 2563241, -9999, "Europe/Rome", "An Roimh,An Ròimh,An Róimh,Erroma,Hrom,Lungsod ng Roma,Mji wa Roma,ROM,Ramma,Rhufain,Rim,Rim,Roeme,Rom,Roma,Rome,Romma,Romo,Romë,Rooma,Roum,Rym,Rzym,Råmma,Rím,Róm,Róma,Urbs,loma,luo ma shi,rm,rom,roma,romi,rwm,rwma,rym,Řím,Ρώμη,Рим,Римъ,Рым,Հռոմ,רומא,رم,روم,روما,رىم,ܪܘܡܐ,रोम,रोमा,โรม,რომი,ሮማ,ローマ,罗马市,로마"),
- new City("3042091", "Saint Helier", 49.18804, -2.10491, "JE", 28000, -9999, "Europe/Jersey", "JER,Saint Helier,Sent-Khel'er,St Helier,St. Helier,Сент-Хельер"),
- new City("3489854", "Kingston", 17.99702, -76.79358, "JM", 937700, -9999, "America/Jamaica", "KIN,Kin'nkston,Kingston,Κίνγκστον,Кингстон"),
- new City("250441", "Amman", 31.95522, 35.94503, "JO", 1275857, -9999, "Asia/Amman", "'Amman,AMM,Ama,Aman,Amanas,Amano,Amman,Ammana,Ammon,Ammán,Ammān,Ammāna,Amàn,Amán,Amã,Gorad Aman,Philadelphia,Rabbah,Rabbath Ammon,`Amman,`Ammān,am'man,am'mana,aman,amana,amani,amman,an man,anman,xam man,yamman,ʻmʼn,ʿmʾn,Αμμάν,Аман,Амман,Аммон,Горад Аман,Ամման,אמאן,עמאן,ئاممان,امان,عمان,عمان شہر,عَمّان,عەممان,ܥܡܐܢ,अम्मान,আম্মান,ਅਮਾਨ,அம்மான்,അമ്മാൻ,อัมมาน,ཨམ་མན།,ამანი,አማን,‘Ammān,アンマン,安曼,암만"),
- new City("1850147", "Tokyo", 35.6895, 139.69171, "JP", 8336599, -9999, "Asia/Tokyo", "Edo,TYO,Tochiu,Tocio,Tokija,Tokijas,Tokio,Tokió,Tokjo,Tokyo,Toquio,Toquio - dong jing,Toquio - 東京,Tòquio,Tókýó,Tóquio,Tōkyō,dokyo,dong jing,dong jing dou,tokeiyw,tokkiyo,tokyo,twkyw,twqyw,Τόκιο,Токио,Токё,Токіо,Տոկիո,טוקיו,توكيو,توکیو,طوكيو,ܛܘܟܝܘ,ܜܘܟܝܘ,टोक्यो,டோக்கியோ,โตเกียว,ტოკიო,东京,東京,東京都,도쿄"),
- new City("184745", "Nairobi", -1.28333, 36.81667, "KE", 2750547, -9999, "Africa/Nairobi", "Gorad Najrobi,NBO,Nairoba,Nairobi,Nairobia,Nairobis,Nairobo,Nairoby,Nairobî,Nairompi,Nairòbi,Nairóbi,Najrobi,Najrobo,Nayrobi,Nayroobi,Naíróbí,Naýrobi,na'irobi,nai luo bi,nailobi,nairobi,nairopi,nayreabi,nayrwby,nei luo bi,nirobi,nyrwby,nyyrwby,Ναϊρόμπι,Горад Найробі,Найроби,Найробі,Најроби,Նայրոբի,נייראבי,ניירובי,نايروبى,نایروبی,نایرۆبی,نيروبي,نیروبی,नैरोबी,নাইরোবি,ਨੈਰੋਬੀ,நைரோபி,ನೈರೋಬಿ,നയ്റോബി,ไนโรบี,ནའི་རོ་བི།,နိုင်ရိုဘီမြို့,ნაირობი,ናይሮቢ,ナイロビ,内罗毕,奈洛比,나이로비"),
- new City("1528675", "Bishkek", 42.87, 74.59, "KG", 900000, -9999, "Asia/Bishkek", "Bichkek,Biscecum,Bischkek,Bishkek,Bishkek osh,Bisjkek,Biskek,Biskeka,Biskekas,Biskeko,Biskekʻ,Bisqeq,Bisqueque,Biszkek,Bixkek,Biŝkeko,Bişkek,Bişqeq,Biškek,Biškeka,Biškekas,Bișkek,Bîşkek,FRU,Frunze,Gorad Bishkek,Mpiskek,Pishkek,Pishpek,bi shen kai ke,bichkhek,bisakeka,bishukeku,biskek,biskeka,biskekk,bisyukekeu,bshkyk,byshkk,byshkyk,bysqq,picukkek,Μπισκέκ,Бишкек,Бишкек ош,Бішкек,Горад Бішкек,Բիշկեք,בישקעק,בישקק,بشکیک,بيشكك,بيشكيك,بيشکک,بیشکک,بیشکێک,बिश्केक,বিশকেক,ਬਿਸ਼ਕੇਕ,பிசுக்கெக்,ಬಿಷ್ಕೆಕ್,ബിഷ്കെക്ക്,บิชเคก,པི་སི་ཁེག,ბიშკეკი,ቢሽኬክ,ビシュケク,比什凯克,비슈케크"),
- new City("1821306", "Phnom Penh", 11.56245, 104.91601, "KH", 1573544, -9999, "Asia/Phnom_Penh", "Gorad Pnampen',Krong Chaktomuk,Nam Van,Nam-Vang,Nom Pen,PNH,Phnom Pen,Phnom Penh,Phnom Pénh,Phnom-Penh,Phnompen,Phnompenh,Phnum Penh,Phnum Peny,Phnum Pénh,Phnum Pény,Phnôm Pênh,Phon Phen,Pnom Pehn',Pnom Pen,Pnom Pen'ch,Pnom Penh,Pnom-Peno,Pnompen,Pnompen',Pnompena,Pnompenis,Pnompeņa,Ville de Phnom Penh,bnwm bnh,fnwm pn,fnwm pېn,jin bian,namapenha,panoma pena,peunompen,phnm pen,phnmpey,pnwm pn,punom pen,punonpen,Πνομ Πενχ,Горад Пнампень,Пном Пен,Пном Пэнь,Пномпень,Պնոմպեն,פנום פן,بنوم بنه,فنوم پن,فنوم پېن,پنوم پن,پنوم‌پن,پنۆم پێن,नामपेन्ह,पनॉम पेन,প্‌নম পেন,புனோம் பென்,พนมเปญ,พนมเปณ,ཕོམ་ཕེན།,ဖနွမ်းပင်မြို့,პნომპენი,ፕኖም ፔን,ភនកពងតរាច,ភ្នំកំពង់ត្រាច,プノンペン,金边,프놈펜"),
- new City("2110257", "Tarawa", 1.3278, 172.97696, "KI", 40311, -9999, "Pacific/Tarawa", "Juzhnaja Tarava,South Tarawa,TRW,Tarawa,Tarawa Sud,Tarawa do Sul,Tarawa-Sud,Zuid-Tarawa,sauseutalawa,Южная Тарава,דרום טאראווה,사우스타라와"),
- new City("921772", "Moroni", -11.70216, 43.25506, "KM", 42872, -9999, "Indian/Comoro", "Moroni,Moronis,YVA,mo luo ni,moloni,moroni,mwrwny,Μορονί,Морони,מורוני,موروني,ሞሮኒ,モロニ,莫洛尼,모로니"),
- new City("3575551", "Basseterre", 17.29484, -62.7261, "KN", 12920, -22, "America/St_Kitts", "Basse Terre Town,Basseterre,Baster,Basteras,Mpaster,SKB,baseteru,Μπαστέρ,Бастер,באסטר,باسه‌تر,ባስቴር,バセテール"),
- new City("1871859", "Pyongyang", 39.03385, 125.75432, "KP", 3222000, -9999, "Asia/Pyongyang", "Binh Nhuong,Bình Nhưỡng,FNJ,Gorad Pkhen'jan,Heijo,Heijo-fu,Heijō,Heijō-fu,Heizyo,Heizyo Hu,Heizyō,Heizyō Hu,Hpyeng-yang,P'yongyang,P'yŏngyang,P-hjong-jang,P-hjöng-jang,Pchenjanas,Pchjongjang,Phenian,Phenjan,Phenjana,Phyeng-yang,Phyong-yang,Pienyang,Pingyang,Pion'gian'nk,Pion'nkgian'nk,Piongiang,Pionyang,Pjoengjang,Pjongian,Pjongjang,Pjongjango,Pjöngjang,Pkhen'jan,Pkhenjan,Pxenyan,Pyengyang,Pyeongyang,Pyoengyang,Pyongyang,Pyöngyang,P’yŏngyang,bywnghyangh,peiyngyang,pi'ongayanga,ping rang,ping rang shi,piyam iyam,piyonyan,pkheniani,pyamgayanga,pyang yang,pyeong-yangjighalsi,pyon'gyang,pyongayanga,pywng yang,pywngyang,Πιονγιάνγκ,Πιονγκγιάνγκ,Горад Пхеньян,Пхеньян,Пхенян,Пјонгјанг,Փխենյան,פיאנגיאנג,פיונגיאנג,بيونغيانغ,پيونګيانګ,پيونگ يانگ,پيوڭياڭ,پیانگ یانگ,پیونگ‌یانگ,پیۆنگیانگ,प्याँगयांग,प्योंगयांग,পিয়ং ইয়াং,ਪਿਓਂਗਯਾਂਗ,பியொங்யாங்,ಪ್ಯೊನ್ಗ್ಯಾಂಗ್,เปียงยาง,ཕོང་ཡང་།,ფხენიანი,ፕዮንግያንግ,平壌,平壤,平壤市,평양직할시"),
- new City("1835848", "Seoul", 37.56826, 126.97783, "KR", 10349312, -9999, "Asia/Seoul", "Choei-yuen,Gorad Seul,Ha-seng,Han-yang,Hang-yang-tcheng,Hansong,Hansŏng,Hā-seng,Hān-yang,Kan-yo-jo,Kan-yō-jō,Keijo,Keizyoe,Keizyōe,Kiung,Kyongsong,Kyŏngsŏng,SEL,Seoel,Seol,Seoul,Seuel,Seul,Seula,Seulas,Seulo,Seulum,Seúl,Seül,Siul,Soeul,Sol,Soul,Suigen,Sye-ul,Syou-ouen,Szoeul,Szöul,Séoul,Sêûl,Söul,Sŏul,Wang-ching,Wo-jo,Wō-jō,ciyol,saul,seoul,seoulteugbyeolsi,seuli,shou er,si'ula,siyola,sol,sola,souru te bie shi,sywl,Σεούλ,Горад Сеул,Сеул,Соул,Сөүл,Սեուլ,סאול,סיאול,סעאל,سئول,سيول,سیول,سێئول,سېئول,सियोल,सोल,সিউল,சியோல்,ಸೌಲ್,സോൾ,โซล,སེ་ཨུལ།,ဆိုးလ်မြို့,სეული,ሶል,សេអ៊ូល,ソウル特別市,首尔,首爾,서울,서울특별시"),
- new City("285787", "Kuwait City", 29.36972, 47.97833, "KW", 60064, -9999, "Asia/Kuwait", "Al Kuwait,Al Kuwayt,Al-Kuwait,Ciudad de Kuwait,KWI,Koeweit,Kota Kuwait,Koveyit,Koweit,Koweït,Kuvaeyt,Kuvajt,Kuvajto,Kuvajturbo,Kuveitas,Kuvejt,Kuväyt,Kuwait,Kuwait City,Kuwait Stad,Kuwait by,Kuwait-Stadt,Kuwait-Urbo,Kuwayt,Kuweit,Kuwejt,Madinat al Kuwayt,Madinat al-Kuwait,Madīnat al Kuwayt,Pole tou Koubeit,Safat,aalkuayt,ke wei te shi,khuwet si ti,kuu~eto,kuweiteu si,kwwyt syty,mdynt alkwyt,Πόλη του Κουβέιτ,Кувейт,כווית סיטי,اَلْكُوَيْت,مدينة الكويت,คูเวตซิตี,クウェート,科威特市,쿠웨이트 시"),
- new City("3580661", "George Town", 19.28692, -81.36706, "KY", 29370, -9999, "America/Cayman", "George Town,Georgetown,jojitaun,qiao zhi dun,ג'ורג' טאון,ジョージタウン,喬治敦"),
- new City("1526273", "Astana", 51.1801, 71.44598, "KZ", 345604, -9999, "Asia/Almaty", "Akmola,Akmolinsk,Aqmola,Astana,Astano,Astanà,Astaná,Asztana,Aστάνα,Ostona,Qaraotkel,Qaraötkel,TSE,Tselinograd,a si ta na,aseutana,astana,astanh,asutana,Астана,Остона,Աստանա,אסטנה,آستانه,أسطانا,আস্তানা,ასტანა,አስታና,アスタナ,阿斯塔纳,아스타나"),
- new City("1651944", "Vientiane", 17.96667, 102.6, "LA", 196731, -9999, "Asia/Vientiane", "Bientian,Fanhyiengh,Gorad V'enc'jan,Nakhon Viangchan,V'ent'jan,VTE,Ventjan,Vianchan,Viang chan,Viangchan,Vien Can,Vien Chang,Vienciana,Vieng Chan,Vieng-Caen,Vieng-Chan,Vieng-Cæn,Viengchan,Viengtjan,Vientane,Vientian,Vientianas,Vientiane,Vientijan,Vientián,Vientjan,Vijentijan,Viêng Chăn,Vjencana,Vjentiano,Vjenčana,Vyantyan,Vyantyàn,Vyentyan,Wei-t'ien,Wei-t’ien,Wiang Chan,Wiangcan,Wien Tsjan,Wientian,Wiën Tsjan,Wyentyan,Wyéntyan,bhiyenatiyena,bientian,fyyntyan,vhi'antiyana,vi'anga cana,viyancan,viyen tiyen,vu~ienchan,vu~ienchan shi,wan xiang,weiyngcanthn,wyntyan,yong zhen,Βιεντιάν,В'єнтьян,Вентян,Виентијан,Виентян,Вијентијан,Вьентьян,Горад В'енцьян,Վյենտյան,ויינטיאן,فيينتيان,وینتیان,ڤیێنتیان,व्हिआंतियान,ভিয়েনতিয়েন,ਵਿਆਂਗ ਚਾਨ,வியஞ்சான்,ವಿಯೆನ್ ಟಿಯೇನ್,เวียงจันทน์,ວຽງຈນ,ວຽງຈັນ,ཝིན་ཆིའང་,ვიენტიანი,ቭየንትዬን,ヴィエンチャン,ヴィエンチャン市,万象,永珍,비엔티안"),
- new City("276781", "Beirut", 33.88894, 35.49442, "LB", 1916100, -9999, "Asia/Beirut", "BEY,Baeyrut,Bayrut,Bayrūt,Beiriut,Beiroet,Beirot,Beirout,Beiroūt,Beirut,Beiruta,Beirutas,Beirute,Beirút,Beirût,Beirūta,Bejrut,Bejrut oshs',Bejruto,Bejrút,Berut,Berytos,Berytus,Bewout,Beyrouth,Beyrut,Birut,Bäyrut,Béiriút,Bêrût,Gorad Bejrut,Peyrutʻ,bairut,bairuta,bayrut,bei lu te,beiluteu,beiruti,beiruto,berut,beruta,beyaruta,beyrutt,biruta,byrwt,byyrwt,peyrut,Βηρυτός,Бейрут,Бейрут ошсь,Бејрут,Бәйрут,Горад Бейрут,Պէյրութ,ביירוט,ביירות,بيروت,بَيْرُوت,بیروت,بېيرۇت,بەیرووت,ܒܝܪܘܬ,बेयरूत,बैरूत,বৈরুত,ਬੇਰੂਤ,ବିରୁଟ,பெய்ரூத்,ಬೈರುತ್,ബെയ്റൂത്ത്,เบรุต,པ་ར་ཐ།,པེ་རུ་ཐེ།,ဘေရွတ်မြို့,ბეირუთი,ቤይሩት,ベイルート,贝鲁特,베이루트"),
- new City("3576812", "Castries", 13.9957, -61.00614, "LC", 10000, -9999, "America/St_Lucia", "Castries,Kastri,Kastris,Port Castries,kaeseuteuliseu,kasutorizu,qstrys,Κάστρις,Кастри,קסטריס,ካስትሪስ,カストリーズ,캐스트리스"),
- new City("3042030", "Vaduz", 47.14151, 9.52154, "LI", 5197, -9999, "Europe/Vaduz", "Bantouz,QVU,Vaduc,Vaducas,Vaduz,Vaduzo,fado~utsu,paducheu,vadutsi,wa dou zi,Βαντούζ,Вадуц,פאדוץ,ვადუცი,ፋዱጽ,ファドゥーツ,瓦都茲,파두츠"),
- new City("1248991", "Colombo", 6.93194, 79.84778, "LK", 648034, -9999, "Asia/Colombo", "CMB,Colombo,Columbo,Gorad Kalomba,Kolombas,Kolombo,Kolompo,Kolonbo,kalambo,kalombo,ke lun po,kealambea,kholambo,klmbw,kolabo,kolambo,kollombo,kolumpu,kolunbu,koronbo,kwlmbw,kwlwmbw,qwlwmbw,Κολόμπο,Горад Каломба,Коломбо,קולומבו,كولمبو,كولومبو,کلمبو,کولمبو,ކޮޅުނބު,कोलंबो,कोलम्बो,কলম্বো,ਕੋਲੰਬੋ,કોલંબો,କଲୋମ୍ବୋ,கொழும்பு,కొలంబో,ಕೊಲಂಬೊ,കൊളംബോ,කොළඹ,ෙකාළඹ,โคลัมโบ,ཁོ་ལུམ་པོ།,ကိုလံဘိုမြို့,კოლომბო,ኮሎምቦ,コロンボ,可倫坡,콜롬보"),
- new City("2274895", "Monrovia", 6.30054, -10.7969, "LR", 939524, -9999, "Africa/Monrovia", "Gorad Manrovija,MLW,Monrobia,Monrofia,Monrovi,Monrovia,Monrovija,Monrovio,Monroviya,Monrowia,Monròvia,Monróvia,Monróvía,manroweiy,meng luo wei ya,monarovi'a,monlobia,monrobia,monrovhiya,monrovia,monroviya,mwnrwbyh,mwnrwfya,mwnrwwya,Μονρόβια,Горад Манровія,Монрови,Монровия,Монровија,Монровія,Մոնրովիա,מונרוביה,مونروفيا,مونروویا,مۆنرۆڤیا,मोन्रोव्हिया,ਮੋਨਰੋਵੀਆ,மொன்ரோவியா,มันโรเวีย,མོང་རོ་ཝི་ཡ།,მონროვია,ሞንሮቪያ,モンロビア,蒙罗维亚,蒙羅維亞,몬로비아"),
- new City("932505", "Maseru", -29.31667, 27.48333, "LS", 118355, -9999, "Africa/Maseru", "MSU,Maserou,Maseru,ma sai lu,ma se ru,maselu,maseru,masrw,masyrw,msrw,Μασερού,Масеру,מסרו,ماسرو,ماسيرو,มาเซรู,መሴሩ,マセル,马塞卢,마세루"),
- new City("593116", "Vilnius", 54.68916, 25.2798, "LT", 542366, -9999, "Europe/Vilnius", "Bilna,Bilnious,Gorad Vil'njus,IVilnyusi,VIL'NJUS,VNO,Vil'njus,Vil'no,Vil'nyus,Viln',Vilna,Vilnia,Vilnias,Vilnious,Vilnis,Vilnius,Vilnjus,Vilnjûs,Vilno,Vilnues,Vilnus,Vilnyus,Vilníus,Vilnüs,Viļņa,Vílnius,Wilna,Wilniyus,Wilno,Wilnus,Wilñus,bhilani'usa,bilnyuseu,fylnyws,vhilniyasa,vilniusi,vilniyas,vu~irinyusu,vylnyws,wei er niu si,wi lni xus,wlnys,wylnh,wylnyws,Βίλνα,Βίλνιους,Βιλνιους,ВИЛЬНЮС,Вилниус,Вилнус,Вилнюс,Вилн҄ь,Вильнюс,Вилњус,Виљнус,Вільнюс,Горад Вільнюс,Վիլնյուս,ווילנע,וילנה,فيلنيوس,ولنیس,ویلنیوس,ڤیلنیوس,व्हिल्नियस,ভিলনিউস,வில்னியஸ்,วิลนีอุส,ལྦེ་ནི་སུ་ནི།,ვილნიუსი,ቪልኒውስ,ᕕᓪᓂᐅᔅ/vilnius,ヴィリニュス,维尔纽斯,빌뉴스"),
- new City("2960316", "Luxembourg", 49.61167, 6.13, "LU", 76684, -9999, "Europe/Luxembourg", "Ciudad de Luxemburgo,Ciutat de Luxemburg,Gorad Ljuksemburg,LUX,Letzebuerg,Letzeburg,Liuksemburgas,Ljuksemburg,Lucemburk,Lucilinburhuc,Lucsamburg,Luksemburg,Luksemburga,Luksemburgo,Luksemburgu,Luksembùrg,Lussemburgo,Lussimbork veye,Luxemborg,Luxembourg,Luxembourg City,Luxemburg,Luxemburgo,Luxembôrg,Luxenburgo,Lëtzebuerg,Lúxemborg,lugsembuleukeu,luksemburgi,lwksmbwrgh,lwkzambwrg,lwqsmbwrg,rukusenburuku,Горад Люксембург,Луксембург,Люксембург,לוקסמבורג,لوكسمبورغ,لوکزامبورگ,ლუქსემბურგი,ሉክሰምበርግ,ルクセンブルク,룩셈부르크"),
- new City("456172", "Riga", 56.946, 24.10589, "LV", 742572, -9999, "Europe/Riga", "Gorad Ryga,RIGA,RIX,Reiga,Riga,Rigae,Rige,Rigg-a,Rigo,Riia,Riigaa,Riika,Rija,Riqa,Ryga,Ríga,Ríge,Rīga,li jia,liga,ri ka,riga,rika,ryga,rygh,rygha,ryja,Ρίγα,Горад Рыга,РИГА,Ригæ,Рига,Ріґа,Ռիգա,ריגה,ריגע,رىگا,ريجا,ريغا,ریگا,रिगा,रीगा,রিগা,ரீகா,รีกา,རི་ག,რიგა,ሪጋ,リガ,里加,리가"),
- new City("2210247", "Tripoli", 32.87519, 13.18746, "LY", 1150989, -9999, "Africa/Tripoli", "Aea,Ea,Gorad Trypali,Oea,TIP,Tarables,Tarabulus,Tarabulus al Gharb,Tarabulus el Gharb,Taràbles,Trablus,Trablûs,Triboli,Tripili,Tripilí,Tripol,Tripole,Tripoli,Tripolis,Tripolo,Tripoly,Tripołi,Tripul,Tripuli,Trypolis,Trìpoli,Trìpuli,Trípol,Trípoli,Trípólí,de li bo li,tarabalasa,tarabulasa,tarabulus,teulipolli,tirippoli,toripori,trabls,trabls, lybya,tripoli,trippeali,trypwly,Ţarābulus,Ţarābulus al Gharb,Τρίπολη,Горад Трыпалі,Триполи,Триполі,Տրիպոլի,טריפאלי,טריפולי,ترابلس,ترىپولى,تەرابلوس,طرابلس,طرابلس، لیبیا,طَرَابُلُس,ताराबूलस,त्रिपोली,ত্রিপোলি,ਤਰਾਬਲਸ,திரிப்பொலி,ട്രിപ്പോളി,ตริโปลี,ཐི་རི་ཕོ་ལི,ტრიპოლი,ትሪፖሊ,トリポリ,的黎波里,트리폴리"),
- new City("2538475", "Rabat", 34.01325, -6.83255, "MA", 1655753, -9999, "Africa/Casablanca", "Gorad Rabat,RBA,Raba,Rabat,Rabata,Rabatas,Rabato,Rabāt,Rabāta,Rampat,Rbat,Rbaṭ,alrbat,la ba te,labateu,raba t,rabat,rabata,rabato,rabota,rapat,rbat,Ραμπάτ,Горад Рабат,Рабат,Ռաբաթ,רבאט,الرباط,رابات,ربات,رباط,ڕەبات,रबात,ਰਬਾਤ,ରବୋଟ,ரபாத்,ราบัต,ར་བ་ཐ།,ར་བ་ཐེ།,რაბატი,ራባት,ラバト,拉巴特,라바트"),
- new City("2993458", "Monaco", 43.73333, 7.41667, "MC", 32965, -9999, "Europe/Monaco", "MCM,Monaco,Monaco-Ville,Monako,Mònaco,Mónaco,Mónakó,Μονακό,Монако"),
- new City("618426", "Chişinău", 47.00556, 28.8575, "MD", 635994, -9999, "Europe/Chisinau", "Chisinau,Chisinau - Chisinau,Chisinau - Chişinău,Chişinău,KIV,Kischinew,Kiscinev,Kishinef,Kishinehu,Kishinev,Kishiniv,Kishinjov,Kishinëv,Kisinaou,Kisinev,Kisineva,Kisinevo,Kisiniovas,Kisinjev,Kisinov,Kisinyov,Kisyneu,Kiszyniow,Kiszyniów,Kiŝinevo,Kişinev,Kišiniovas,Kišinjev,Kišiněv,Kišiņeva,Kišiňov,cisina'u,cisinau,ji xi ne wu,kishinau,kisineou,kyshynaw,Κισινάου,Κισιναου,Кишинев,Кишинэу,Кишинёв,Кишињев,Кішынёў,Կիշինյով,קישינאו,كيشيناو,चिशिनाउ,चिशिनौ,კიშინიოვი,ኪሺንው,キシナウ,基希讷乌,키시너우"),
- new City("3193044", "Podgorica", 42.44111, 19.26361, "ME", 136473, -9999, "Europe/Podgorica", "Birziminium,Gorad Padgoryca,Podgairitse,Podgairítse,Podgorica,Podgoricae,Podgoricja,Podgorico,Podgorika,Podgoritsa,Podgoritza,Podgorytsa,Podgòrica,Podqoritsa,Podugorica,Pontnkoritsa,TGD,Titograd,bo de ge li cha,bwdghwrytsa,padagoritasa,phx dk xrit sa,podagorika,podeugolicha,podogoritsu~a,pwdgwrytsa,pwdgwryzh,Ποντγκόριτσα,Горад Падгорыца,Подгоритса,Подгорицæ,Подгорица,Подгориця,Подъгорица,Պոդգորիցա,פודגוריצה,بودغوريتسا,پودگوریتسا,پوڈگوریکا,پۆدگۆریسا,पॉडगोरिका,ਪਾਡਗੋਰਿਤਸਾ,พอดกอรีตซา,პოდგორიცა,ፖድጎሪጻ,ポドゴリツァ,波德戈里察,포드고리차"),
- new City("3578851", "Marigot", 18.06667, -63.08333, "MF", 5700, -9999, "America/Marigot", "Marigo,Marigot,Мариго"),
- new City("1070940", "Antananarivo", -18.91368, 47.53613, "MG", 1391433, -9999, "Indian/Antananarivo", "Antananarifo,Antananarivo,Antananarivu,Antananariwo,Antananaryvas,Antananarywa,Antananarívó,Gorad Antananaryvu,TNR,Tana,Tananaribe,Tananarive,anrananarivea,antananalibo,antananaribo,antananarivho,antananarivo,antananaryfw,antananaryww,antʼananarivu,atananarivo,ta na na li fu,xan ta nana ri wo,Ανταναναρίβο,Ταναναρίβη,Антананариво,Антананариву,Антананаріву,Горад Антананарыву,Тананариве,Անտանանարիվու,אנטננריבו,آنتاناناریوو,أنتاناناريفو,ئانتاناناریڤۆ,انٹاناناریوو,اینٹانانیریو,अंतानानारिव्हो,अन्टाननरीवो,ਅੰਤਾਨਾਨਾਰੀਵੋ,அண்டனானரீவோ,ആന്റനനറീവൊ,อันตานานาริโว,ཨེན་ཊ་ན་ན་རི་བོ།,ანტანანარივუ,አንታናናሪቮ,アンタナナリボ,塔那那利佛,안타나나리보"),
- new City("2113779", "Majuro", 7.08971, 171.38027, "MH", 25400, -9999, "Pacific/Majuro", "MAJ,Madzhuro,Majur,Majuro,Mazouro,Μαζούρο,Маджуро"),
- new City("785842", "Skopje", 42.00122, 21.42878, "MK", 474889, -9999, "Europe/Skopje", "Gorad Skop'e,SKP,Scopia,Scupi,Shkup,Shkupi,Skop'e,Skope,Skopeia,Skopia,Skopie,Skopiye,Skopje,Skopjo,Skopjė,Skople,Skoplie,Skoplje,Skopye,Szkopje,UEskuep,Uskub,Usküb,askwpyh,s ko peiy,sakopi'e,seukope,si ke pu li,skopje,skopye,skwbyh,sqwpyh,sukopie,Üsküp,Σκόπια,Горад Скоп'е,Скоп'є,Скопе,Скопие,Скопье,Скопје,Скопље,Съкопиѥ,Սկոպյե,סקאפיע,סקופיה,اسکوپیه,اسکوپیہ,سكوبيه,سكوپليې,سکوپ جے,स्कोप्ये,ਸਕੋਪੀਏ,ஸ்கோப்ஜே,สโกเปีย,སི་ཀོཔ་ཇི།,სკოპიე,ስኮፕዬ,スコピエ,斯科普里,스코페"),
- new City("2460596", "Bamako", 12.65, -8, "ML", 1297281, -9999, "Africa/Bamako", "BKO,Bamaco - Bamako,Bamakas,Bamako,Bamaku,Bamakó,Bamakɔ,Bammaco,Bammako,Mpamako,ba ma ke,bamako,bamakw,bmqw,Μπαμάκο,Бамако,Բամակո,במקו,باماكو,باماکو,ባማኮ,バマコ,巴馬科,바마코"),
- new City("6611854", "Nay Pyi Taw", 19.745, 96.12972, "MM", 925000, -9999, "Asia/Rangoon", "NYT,Nay Pyi Taw,Naypyidaw,Ne Pyi Daw"),
- new City("2028462", "Ulaanbaatar", 47.90771, 106.88324, "MN", 844818, -9999, "Asia/Ulaanbaatar", "Da Huryee,Da Hüryee,Da Khure,Da-Kure,K'u-lun,Orgoo,Oulan Mpator,Oulan-Bator,Ourga,ULN,Ulaan Baatar,Ulaan Baatar Hoto,Ulaanbaatar,Ulaanbaataro,Ulaanbaator,Ulaanbaator hota,Ulaanbaatur,Ulan Bator,Ulan Bator Hoto,Ulan Batoras,Ulan Batur,Ulan-Bator,Ulan-Bator Khoto,Ulanbatar,Ulanbator,Ulanbátar,Ulán Bator,Ulán Bátor,Ulánbátar,Ulánbátor,Uranbatoru,Urga,Uruga,Ułan Bator,awlan batwr,ulanabatara,ullanbatoleu,uranbatoru,wu lan ba tuo,xulanbatxr,Örgöö,Ουλάν Μπατόρ,Улаанбаатар,Улан Батор,Улан-Батор,אולן בטור,أولان باتور,اولان‌باتور,उलानबातर,อูลานบาตอร์,ཝུ་ལན་བ་ཐུར,ኡላዓን ባዓታር,ウランバートル,乌兰巴托,울란바토르"),
- new City("1821274", "Macau", 22.20056, 113.54611, "MO", 520400, -9999, "Asia/Macau", "Aomen,Aomin',Au-mun,Aumwnz,Aumyn,Cidade de Macau,Cidade do Santo Nome de Deus de Macau,MFM,Ma Cao,Macao,Macau,Macaum,Makaa,Makaaw,Makao,Makaou,Makau,Makaw,Makawo,Makaó,Makee,Makèë,Màkáù,O-muong,ao men,maka,maka'o,maka'u,makao,makavu,makaw,makayw,makkavu,mkaw,Àu-mûn,Ó̤-muòng,Μακάου,Аоминь,Аумын,Макаа,Макао,מקאו,ئاۋمېن,ماكاو,ماکائو,مکاؤ,މަކާއޫ,मकाउ,मकाओ,মাকাউ,ਮਕਾਉ,મકાઉ,மக்காவு,మకావు,ಮಕಾವು,മകൗ,เขตบริหารพิเศษมาเก๊า,မကာအို,მაკაო,マカオ,澳門,澳门,마카오"),
- new City("7828758", "Saipan", 15.21233, 145.7545, "MP", 48220, 5, "Pacific/Saipan", "SPN"),
- new City("3570675", "Fort-de-France", 14.60892, -61.07334, "MQ", 89995, -9999, "America/Martinique", "FDF,For d'o Frans,For de Frans,For de Fransas,For-de-Frans,For-nte-Frans,Fordefransa,Fort Royal,Fort-de-France,Fort-de-Frans,Fôrt-de-France,Gorad Fort-deh-Frans,Le Fort-de-France,f xr-dex-fr xngs,fa lan xi bao,foru=do=furansu,fwr dw frans,fwr-dw-frans,phorta-de-phransa,poleudeupeulangseu,por-de-pransi,Φορ-ντε-Φρανς,Горад Форт-дэ-Франс,Фор де Франс,Фор дьо Франс,Фор-де-Франс,Форт-де-Франс,פור-דה-פראנס,فور دو فرانس,فور-دو-فرانس,فورٹ ڈی فرانس,फोर्ट-दे-फ्रान्स,ฟอร์-เดอ-ฟร็องส์,ფორ-დე-ფრანსი,フォール=ド=フランス,法兰西堡,포르드프랑스"),
- new City("2377450", "Nouakchott", 18.08581, -15.9785, "MR", 661400, -9999, "Africa/Nouakchott", "Gorad Nuakshot,NKC,Naevakjut,Nawakshot,Nawakszut,Nouakchat,Nouakchot,Nouakchott,Nouaksot,Nouaxot,Nuakchot,Nuakshot,Nuaksjott,Nuaksot,Nuaksota,Nuaksotas,Nuaksoto,Nuaksott,Nuakxot,Nuakŝoto,Nuakşot,Nuakšota,Nuakšotas,Nuakšott,Nävakjut,Núaksjott,navakasuta,navakcot,nu wa ke xiao te,nu'oyakasuta,nuagsyoteu,nuakushotto,nwakshwt,Νουακσότ,Νουαξότ,Горад Нуакшот,Нуакшот,Նուակշոտ,נואקשוט,نواكشوط,نواکشوت,نواکشوط,نواکشۆت,نوواکوٹ,नवाकसुत,নুওয়াকশুত,நவாக்சோட்,นูแอกชอต,ནའུ་ཀ་ཅོ་ཊི།,ნუაქშოტი,ኑዋክሾት,ヌアクショット,努瓦克肖特,누악쇼트"),
- new City("3578069", "Plymouth", 16.70555, -62.21292, "MS", 0, -9999, "America/Montserrat", "Plymouth"),
- new City("2562305", "Valletta", 35.89972, 14.51472, "MT", 6794, -9999, "Europe/Malta", "A Valeta,A Valletta,Baleta,Baletta,Gorad Valeta,La Valet,La Valeta,La Valeto,La Valetta,La Valette,La Valletta,La Valèt,La Valëtta,La-Valeto,Vaileite,Valeta,Valetta,Valleta,Vallett,Valletta,Vallettae,Waleta,balleta,baretta,bhalletta,falyta,valaita,valletta,vheleta,wa lai ta,wal let ta,walta,wlth,Βαλέτα,Βαλέττα,Валета,Валетта,Валлеттæ,Валлетта,Горад Валета,Ла Валета,Ла Валетта,Վալետա,ולטה,فاليتا,والتا,والیٹا,ولیٹا,व्हॅलेटा,ভাল্লেত্তা,ਵਲੈਟਾ,வல்லெட்டா,วัลเลตตา,ཝ་ལེ་ཐ།,ვალეტა,ቫሌታ,バレッタ,瓦莱塔,발레타"),
- new City("934154", "Port Louis", -20.16194, 57.49889, "MU", 155226, -9999, "Indian/Mauritius", "Por Loui,Port Louis,Port Louis Town,Port Luis Mauricijus,Port Luisas,Port-Louis,Port-Lui,bwr lwys,lu yi gang,poteulu-iseu,potoruisu,Πορ Λουί,Порт Луис Маурицијус,Порт-Луи,פורט לואיס,بور لويس,پورت‌لوئیس,ፖርት ሉዊስ,ポートルイス,路易港,포트루이스"),
- new City("1282027", "Male", 4.1748, 73.50888, "MV", 103693, -9999, "Indian/Maldives", "MLE,Maale,Male,Malé,Malė,ma lei,ma lu,male,malle,mare,Μαλέ,Мале,מאלה,މާލެ,माले,মালে,மாலே,มาเล,มาเล่,マレ,瑪律,馬累,말레"),
- new City("927967", "Lilongwe", -13.96692, 33.78725, "MW", 646750, -9999, "Africa/Blantyre", "LLW,Lilon'nkoue,Lilonguee,Lilongve,Lilongvė,Lilongwe,Lilongüe,Lílongve,li long gui,lillong-gwe,lylwngwwh,rironguu~e,Λιλόνγκουε,Лилонгве,Լիլոնգվե,לילונגווה,ሊሎንግዌ,リロングウェ,利隆圭,릴롱궤"),
- new City("3530597", "Mexico City", 19.42847, -99.12766, "MX", 12294193, -9999, "America/Mexico_City", "Cidade de Mexico,Cidade de México,Cidade do Mexico,Cidade do México,Cita du Messicu,Citta del Messico,Città del Messico,Cità dû Messicu,Cità dû Mèssicu,Ciudad Mexico,Ciudad de Mejico,Ciudad de Mexico,Ciudad de Méjico,Ciudad de México,Ciutat de Mexic,Ciutat de Mèxic,Lungsod ng Mexico,Lungsod ng México,MEX,Mehiko,Mekhiko,Meksikas,Meksiko,Meksiko Siti,Meksikurbo,Meksyk,Mexico,Mexico City,Mexico D.F.,Mexico DF,Mexico Distrito Federal,Mexico by,Mexico-stad,Mexicopolis,Mexiko,Mexiko Hiria,Mexiko-Stadt,Mexikoborg,Mexíkóborg,México,México Distrito Federal,Pole tou Mexikou,Valle de Mexico,Valle de México,mdynt mksykw,megsiko si,mekishikoshiti,meksiko siti,meksikositi,mkzykw,mkzykwsyty,mo xi ge cheng,mqsyqw syty,Πόλη του Μεξικού,Мексико,Мексико Сити,Мехико,Мехіко,מקסיקו סיטי,مدينة مكسيكو,مکزیکو,مکزیکوسیتی,مېكسىكا شەھىرى,मेक्सिको सिटी,เม็กซิโกซิตี,მეხიკო,メキシコシティ,墨西哥城,멕시코 시"),
- new City("1735161", "Kuala Lumpur", 3.1412, 101.68653, "MY", 1453975, -9999, "Asia/Kuala_Lumpur", "Gizlungzpoh,Gorad Kuala-Lumpur,KUL,Kouala Loumpou,Kouala Loumpour,Kuala Lumpor,Kuala Lumpur,Kuala-Lumpur,Kuala-Lumpuro,Kualae-Lumpur,Kualalumpura,Kualalumpūra,Kvala Lumpuras,Kvala Lumpūras,Kúala Lúmpúr,ji long po,kaulalampur,kawlalampexr,kolalampur,ku'a lalampura,ku'ala lupura,ku'alalampura,ku'alalumpura,kuallalumpuleu,kuararunpuru,kuyalalamapura,kvalalampura,kwala lambwr,kwala lmpwr,kwalalampwr,kwalalmbwr,kwalalmpwr,kwalalwmpwr,kۇyalalۇmpۇr,Κουάλα Λουμπούρ,Горад Куала-Лумпур,Куалæ-Лумпур,Куала Лумпур,Куала-Лумпур,Կուալա Լումպուր,קואלה לומפור,كوالا لامبور,كوالالمبور,كۇئالالۇمپۇر,کوالا لمپور,کوالالامپور,کوالالمپور,کوالالومپور,कुआ लालम्पुर,कुआलालम्पुर,क्वालालंपूर,কুয়ালালামপুর,ਕੁਆਲਾ ਲੁੰਪੁਰ,କୁଆଲାଲୁମ୍ପୁର,கோலாலம்பூர்,ಕೌಲಾಲಂಪುರ್,കോലാലമ്പൂർ,กัวลาลัมเปอร์,ཁལ་ལུང་ཕུ།,ကွာလာလမ်ပူမြို့,კუალა-ლუმპური,ኩዋላ ሉምፑር,クアラルンプール,吉隆坡,쿠알라룸푸르"),
- new City("1040652", "Maputo", -25.96553, 32.58322, "MZ", 1191613, -9999, "Africa/Maputo", "Can Pfumo,Gorad Maputu,Kapfumo,Lourenco Marques,Lourenço Marques,MPM,Mabuto,Mabutu,Mapouto,Maputo,Maputu,Mapútó,ma pu to,ma pu tuo,mabwtw,maputo,maputto,maputu,mapwtw,mpwtw,Μαπούτο,Горад Мапуту,Мапуто,Мапуту,Մապուտու,מפוטו,مابوتو,ماپوتو,ماپوتۆ,ماپوٹو,मापुतो,ਮਾਪੂਤੋ,மபூட்டோ,มาปูโต,མ་པུ་ཊོ།,მაპუტუ,ማፑቶ,マプト,马普托,마푸투"),
- new City("3352136", "Windhoek", -22.55941, 17.08323, "NA", 268132, -9999, "Africa/Windhoek", "Gorad Vindkhuk,Gouintchouk,Vindguk,Vindhuk,Vindhuka,Vindhukas,Vindhuko,Vindkhuk,Vintchouk,WDH,Windhoek,Windhuk,Windoek,Windoèk,Wynhoeke,binteuhukeu,u~intofukku,vindahoka,vintok,vitahuka,wen de he ke,win dhuk,wyndhwk,wyndhwq,Βίντχουκ,Γουίντχουκ,Виндхук,Віндгук,Горад Віндхук,Վինդհուկ,וינדהוק,ونڈہوک,ويندهوك,ویندهوک,ویندھۆک,विंडहोक,ਵਿੰਟਹੁਕ,விந்தோக்,วินด์ฮุก,ཝིན་ཌི་ཧོཡིཀ།,ვინდჰუკი,ዊንድሁክ,ウィントフック,温得和克,빈트후크"),
- new City("2139521", "Nouméa", -22.27631, 166.4572, "NC", 93060, -9999, "Pacific/Noumea", "Gorad Numea,NOU,Nomea,Noumea,Nouméa,Numea,Numeja,Numeo,Numėja,Port de France,nu me xa,nu mei a,nume'a,numea,nwmya,Νουμέα,Горад Нумеа,Нумеа,نوميا,نومیا,नूमेआ,นูเมอา,ნუმეა,ヌメア,努美阿,누메아"),
- new City("2440485", "Niamey", 13.51366, 2.1098, "NE", 774235, -9999, "Africa/Niamey", "Gorad Nijamej,NIM,Niame,Niamei,Niamej,Niameja,Niamejus,Niameo,Niamey,Niamè,Niamėjus,Nijamej,Níamey,ni ya mei,ni'ami,niame,niamei,nixame,niyame,niyami,nyamy,nyʼmyy,Νιαμέι,Νιαμέυ,Горад Ніямей,Ниамей,Нијамеј,Ніамей,Նիամեյ,ניאמיי,نيامي,نیامی,نیامەی,ܢܝܐܡܝ,नियामे,নিয়ামে,ਨਿਆਮੀ,நியாமி,นีอาเม,ནི་ཡ་མེ།,ნიამეი,ኒያሜ,ニアメ,尼亞美,니아메"),
- new City("2161314", "Kingston", -29.05459, 167.96628, "NF", 880, -9999, "Pacific/Norfolk", "Kingston,kingseuteon,kingusuton,Кингстон,キングストン,킹스턴"),
- new City("2352778", "Abuja", 9.06853, 7.48375, "NG", 590400, -9999, "Africa/Lagos", "ABV,Abouja,Abuca,Abudza,Abudzha,Abudża,Abudža,Abugia,Abugo,Abuja,Abuya,Abuzha,Abuĝo,Abùjá,Ampouza,Gorad Abudzha,a bu gu,a bu jia,abuja,abwja,apuja,xabu ca,yabwja,Αμπούζα,Абуджа,Абужа,Абуџа,Абуҷа,Горад Абуджа,Աբուջա,אבוג'ה,אבודזשא,آبوجا,أبوجا,ئابوجا,ابوجا,अबुजा,আবুজা,ਅਬੁਜਾ,ଅବୁଜା,அபுஜா,അബുജ,อาบูจา,ཨ་པུ་ཅ།,အဘူဂျာမြို့,აბუჯა,አቡጃ,アブジャ,阿布贾,아부자"),
- new City("3617763", "Managua", 12.13282, -86.2504, "NI", 973087, -9999, "America/Managua", "Gorad Managua,MGA,Managoua,Managua,Managuae,Managva,Managvo,Managûa,Manahuac,Manankoua,Manaqua,Manawa,Manágua,Mānāhuac,ma na gua,managhwa,managu'a,managua,managva,managwa,manakaw,manakuva,Μανάγκουα,Горад Манагуа,Манагва,Манагуæ,Манагуа,Մանագուա,מנגואה,ماناغوا,ماناگوآ,ماناگوا,ماناگۇئا,मानाग्वा,ਮਾਨਾਗੁਆ,மனாகுவா,มานากัว,མ་ན་གུ་འ།,მანაგუა,ማናጓ,マナグア,馬拿瓜,馬納瓜,마나과"),
- new City("2759794", "Amsterdam", 52.37403, 4.88969, "NL", 741636, -9999, "Europe/Amsterdam", "AMS,Amesterdam,Amistardam,Amstardam,Amstedam,Amstelodamum,Amsterdam,Amsterdama,Amsterdamas,Amsterdami,Amsterdamo,Amsterdao,Amsterdão,Amsterntam,Amstèdam,Amszterdam,Damsko,Gorad Amstehrdam,I-Amsterdami,a mu si te dan,aimstardaima,amasataradama,amastaradama,amseuteleudam,amstardama,amstartam,amstrdam,amusuterudamu,anstardyam,emstardyama,xamstexrdam,Àmsterdam,Ámsterdam,Άμστερνταμ,Амстердам,Горад Амстэрдам,Ամստերդամ,אמסטערדאם,אמסטרדם,آمستردام,أمستردام,ئامستېردام,ئەمستردام,امستردام,امسټرډام,ایمسٹرڈیم,ܐܡܣܛܪܕܐܡ,अ‍ॅम्स्टरडॅम,आम्स्टर्डम,एम्स्टर्ड्याम,ऐम्स्टर्डैम,আমস্টারডাম,ਅਮਸਤਰਦਮ,ஆம்ஸ்டர்டம்,ಆಂಸ್ಟರ್ಡ್ಯಾಮ್,ആംസ്റ്റർഡാം,ඈම්ස්ටර්ඩෑම්,อัมสเตอร์ดัม,ཨེམ་སི་ཊར་ཌམ།,အမ်စတာဒမ်မြို့,ამსტერდამი,አምስተርዳም,アムステルダム,阿姆斯特丹,암스테르담"),
- new City("3143244", "Oslo", 59.91273, 10.74609, "NO", 580000, -9999, "Europe/Oslo", "Asloa,Christiania (historical),Gorad Osla,Kristiania (historical),OSL,Ohoro,Oslas,Oslo,Oslo osh,Oslu,Osló,ao si lu,asalo,aslw,awslw,osalo,oseullo,oslea,oslo,osuro,xxslo,ywslw,Òslo,Ósló,Ōhoro,Όσλο,Горад Осла,Осло,Осло ош,Օսլո,אוסלו,أوسلو,ئوسلو,ئۆسلۆ,اسلو,اوسلو,ܐܘܣܠܘ,ओस्लो,ওসলো,ਓਸਲੋ,ଅସଲୋ,ஒஸ்லோ,ഓസ്ലൊ,ออสโล,ཨོ་སི་ལོ།,အော့စလိုမြို့,ოსლო,ኦስሎ,オスロ,奥斯陆,오슬로"),
- new City("1283240", "Kathmandu", 27.70169, 85.3206, "NP", 1442271, 1317, "Asia/Kathmandu", "Catmandu,KTM,Kantipur,Kantipura,Kathmandau,Kathmandou,Kathmandu,Katmandou,Katmandu,Katmanduo,Katmandú,Katmantou,Khatmandu,Káthmandu,Káthmándú,jia de man dou,kateumandu,kath manthu,kathamadaum,kathamandu,kathmandw,katmandw,katmantu,katomanzu,qtmndw,yem jilla,Κατμαντού,Катманду,קטמנדו,كاتماندۇ,كاثماندو,کاتماندو,کھٹمنڈو,काठमांडू,काठमाडौं,येँ जिल्ला,কাঠমান্ডু,காட்மாண்டூ,กาฐมาณฑุ,ཀ་ཏ་མན་ཏ།,ཀ་ཏ་མན་ཏུ།,ካትማንዱ,カトマンズ,加德滿都,카트만두"),
- new City("4036284", "Alofi", -19.05952, -169.91867, "NU", 624, -9999, "Pacific/Niue", "Alofi,Alofis,alwfy,arofi,Алофис,الوفی,アロフィ"),
- new City("2179537", "Wellington", -41.28664, 174.77557, "NZ", 381900, -9999, "Pacific/Auckland", "Gorad Velingtan,Ouellin'nkton,Ouellinkton,Te Whanga-nui-a-Tara,Ueligitone,Uelingtun,Velington,Velingtona,Velingtonas,Velingtono,Vellington,Vellingtonia,Vellinqton,WLG,Welinton,Welintòn,Wellingatun,Wellington,Whanga-nui-a-Tara,hui ling dun,oyelintana,raelintana,u~erinton,velingatana,velingtana,velintan,vellingtan,wellingtan,wellingteon,wlyngtwn,wylynghtwn,Ουέλλιγκτον,Ουέλλινγκτον,Велингтон,Веллингтон,Веллінгтон,Горад Велінгтан,Уелингтън,Վելինգտոն,ולינגטון,װעלינגטאן,ولینگتون,ويلينغتون,ویلنگٹن,ۋېللىنگتون,वेलिंगटन,वेलिंग्टन,ওয়েলিংটন,ৱেলিংটন,વેલિંગ્ટન,வெலிங்டன்,ವೆಲ್ಲಿಂಗ್ಟನ್,เวลลิงตัน,ཝེ་ལིང་ཐོན།,ဝယ်လင်တန်မြို့,ველინგტონი,ዌሊንግተን,ウェリントン,惠灵顿,웰링턴"),
- new City("287286", "Muscat", 23.61387, 58.5922, "OM", 797000, -9999, "Asia/Muscat", "Gorad Maskat,MCT,Maeskat,Mascat,Mascate,Maskat,Maskata,Maskatas,Maskate,Maskato,Maskˌat,Masqat,Masqaţ,Masquat,Maszkat,Mouskat,Muscat,Muskat,Mäskat,Múskat,ma si ka te,ma si ke te,masakata,maskat,maskata,masqata,masukatto,mhafzt msqt,msqt,museukateu,mʼsqt,Μουσκάτ,Горад Маскат,Маскат,Масқат,Мускат,Մասկատ,מאסקט,محافظة مسقط,مسقط,مۇسكات,مەسقەت,मस्कत,मस्क़त,মাস্কাট,ਮਸਕਟ,ମସ୍କଟ,மஸ்கத்,మస్కట్,มัสกัต,མི་སི་ཁ་ཁྲི།,მასკატი,መስከት,マスカット,马斯喀特,무스카트"),
- new City("3703443", "Panamá", 8.9936, -79.51973, "PA", 408168, -9999, "America/Panama", "Ciudad de Panama,Ciudad de Panamá,Ciutat de Panama,Ciutat de Panamà,PTY,Panama,Panama City,Panama Hiria,Panama by,Panama-Stadt,Panama-Urbo,Panama-stad,Panamurbo,Panamá,Pole tou Panama,Ziuda de Panama,Ziudá de Panamá,ba na ma cheng,panama si,panama siti,panamashiti,panamasiti,pnmh syty,shhr panama,Πόλη του Παναμά,Панама,פנמה סיטי,شهر پاناما,पनामा सिटी,ปานามาซิตี,ፓናማ ከተማ,パナマシティ,巴拿馬城,파나마 시"),
- new City("3936456", "Lima", -12.04318, -77.02824, "PE", 7737002, -9999, "America/Lima", "Gorad Lima,LIM,Lima,Limae,Limo,Lioma,Lungsod ng Lima,Líma,Líoma,Lîma,li ma,lima,lyma,lymh,rima,Λίμα,Горад Ліма,Лимæ,Лима,Ліма,Լիմա,לימא,לימה,لىما,ليما,لیما,लिमा,लीमा,লিমা,ਲੀਮਾ,ଲିମା,லிமா,ലിമ,ลิมา,ལི་མ།,ლიმა,ሊማ,リマ,利馬,리마"),
- new City("4033936", "Papeete", -17.53333, -149.56667, "PF", 26357, -9999, "Pacific/Tahiti", "PPT,Pape'ete,Papeehte,Papeete,Papeetė,Papeiti,Papete,Pape’ete,Papiete,Papiti,Vaiete,papete,papiete,Папеете,Папете,Папеэте,パペーテ,파피에테"),
- new City("2088122", "Port Moresby", -9.44314, 147.17972, "PG", 283733, -9999, "Pacific/Port_Moresby", "POM,Port Moresby,Port Moresmpi,Port Morsbis,Port Morzbi,Port-Morsbi,Pot Mosbi,mo er zi bi gang,poteu moseubi,potomoresubi,pwrt mwrsby,Πορτ Μόρεσμπι,Порт Морзби,Порт-Морсби,פורט מורסבי,پورت مورسبی,ፖርት ሞርስቢ,ポートモレスビー,莫尔兹比港,포트 모스비"),
- new City("1701668", "Manila", 14.6042, 120.9822, "PH", 10444527, -9999, "Asia/Manila", "Dakbayan sa Manila,Gorad Manila,MNL,Mainile,Manila,Manilae,Manilla,Manillah,Manille,Manilo,Manyl,Maníla,Maynila,Menila,ma ni la,manila,manilla,manira,manyl,manyla,mnila,mnylh,myanila,Μανίλα,Горад Маніла,Манилæ,Манила,Маніла,מנילה,مانىلا,مانيلا,مانیل,مانیلا,मनिला,मनीला,ম্যানিলা,மணிலா,ಮನಿಲ,මැනිලා,มนิลา,มะนิลา,མ་ནི་ལ།,မနီလာမြို့,მანილა,ማኒላ,マニラ,马尼拉,마닐라"),
- new City("1176615", "Islamabad", 33.72148, 73.04329, "PK", 601600, -9999, "Asia/Karachi", "Gorad Islamabad,ISB,Islamabad,Islamabada,Islamabadas,Islamabade,Islamabadi,Islamabado,Islamahbad,Islamampant,Islàmabad,Islámábád,Islāmābād,Islāmābāda,Iszlamabad,Iszlámábád,aslam abad,isalamabada,iseullamabadeu,islamabad,islamabada,islamabadi,islamapat,isuramabado,xislamabad,yi si lan bao,yyslamabad,yyslamyabad,Îslamabad,İslamabad,Ισλαμαμπάντ,Ісламабад,Горад Ісламабад,Исламабад,Իսլամաբադ,איסלאמאבאד,איסלמבאד,إسلام آباد,ئىسلامئاباد,ئیسلاماباد,اسلام آباد,اسلام اباد,اسلام‌آباد,އިސްލާމްއާބާދު,इस्लामाबाद,ইসলামাবাদ,ਇਸਲਾਮਾਬਾਦ,ઇસ્લામાબાદ,ଇସଲାମାବାଦ,இஸ்லாமாபாத்,ಇಸ್ಲಾಮಾಬಾದ್,ഇസ്ലാമബാദ്,อิสลามาบัด,ཨི་སི་ལམ་བོ།,ისლამაბადი,ኢስላማባድ,イスラマバード,伊斯兰堡,이슬라마바드"),
- new City("756135", "Warsaw", 52.22977, 21.01178, "PL", 1702139, -9999, "Europe/Warsaw", "Barsobia,VARSHAVA,Varsa,Varsava,Varsavia,Varsavja,Varshava,Varshavae,Varshovija,Varsja,Varsjá,Varso,Varsova,Varsovia,Varsovia - Warszawa,Varsovie,Varsovio,Varssavi,Varsuva,Varsòvia,Varsó,Varsóvia,Varşova,Varşovia,Varšava,Varšuva,Vársá,WAW,Warsaw,Warsawa,Warschau,Warskou,Warszaw,Warszawa,Waršawa,baleusyaba,hua sha,varshava,vorso,warsw,warushawa,wrsh,wrshw,wrsw,wxrsx,Βαρσοβία,ВАРШАВА,Варшавæ,Варшава,Варшовия,Վարշավա,ווארשע,ורשה,װאַרשע,وارسو,ورشو,ۋارشاۋا,ܘܪܣܘ,वॉर्सो,วอร์ซอ,ვარშავა,ዋርሶው,ワルシャワ,华沙,華沙,바르샤바"),
- new City("3424934", "Saint-Pierre", 46.78091, -56.17196, "PM", 6200, -9999, "America/Miquelon", "Saint Pierre,Saint-Pierre,St Pierre,saengpieleu,생피에르"),
- new City("4030723", "Adamstown", -25.06597, -130.10147, "PN", 46, -9999, "Pacific/Pitcairn", "Adams Town,Adamstaun,Adamstauno,Adamstaŭno,Adamstown,adamusutaun,Адамстаун,אדמסטאון,アダムスタウン"),
- new City("4568127", "San Juan", 18.46633, -66.10572, "PR", 418140, 7, "America/Puerto_Rico", "Gorad San-Khuan,SJU,San Chouan,San Chuanas,San Juan,San Juan de Puerto Rico,San Khuan,San Xoan,San Xoán,San Xuan,San-Juano,San-Khuan,Sanhuana,can van,san hwn,san jwan,san khwan,san khwan, bwrtwrykw,san-khuani,sana hu'ana,sana huraana,sanfuan,sanhuan,sheng hu an,Σαν Χουάν,Горад Сан-Хуан,Сан Хуан,Сан-Хуан,Սան Խուան,סן חואן,سان جوآن,سان خوآن,سان خوان، بورتوريكو,सान हुआन,সান হুৱান,சான் வான்,ซานฮวน,სან-ხუანი,サンフアン,圣胡安,산후안"),
- new City("2267057", "Lisbon", 38.71667, -9.13333, "PT", 517802, -9999, "Europe/Lisbon", "Felicitas Julia,Felicitas Julia Olissipo,LIS,Liospoin,Liospóin,Lisabon,Lisabona,Lisboa,Lisbon,Lisbona,Lisbonne,Lisbono,Lisbonum,Lissabon,Lisszabon,Lizboa,Lizbon,Lizbona,Olisipo,Olissipo,li si ben,lisaboni,lisbana,lisbxn,liseubon,lshbwnt,lysabwn,lysbwn,risubon,Λισαβώνα,Лисабон,Лиссабон,Лісабон,Լիսբոնա,ליסבון,لشبونة,لىسابون,لیسبون,ܠܫܒܘܢܐ,लिस्बन,ลิสบอน,ლისაბონი,ሊዝቦን,リスボン,里斯本,리스본"),
- new City("7303944", "Melekeok", 7.50043, 134.62355, "PW", 0, 70, "Pacific/Palau", "Melekeok"),
- new City("3439389", "Asunción", -25.30066, -57.63591, "PY", 1482200, -9999, "America/Asuncion", "ASU,Asounsion,Asounsyon,Asounsyòn,Asounthion,Assumptio,Assuncao,Assuncion,Assunção,Asuncion,Asunciono,Asunción,Asuns'jon,Asuns'on,Asunsaun,Asunsion,Asunsjon,Asunsjona,Asunsjonas,Asunson,Asunsyon,Asunsyun,Asúnsjón,Gorad Asuns'jon,Gunung Berapi Asuncion,La Muy Noble y Leal Ciudad de Nuestra Senora Santa Maria de la Asuncion,La Muy Noble y Leal Ciudad de Nuestra Señora Santa María de la Asunción,Nuestra Senora Santa Maria de la Asuncion,Nuestra Señora Santa María de la Asunción,Paraguay,acunciyon,asnshn,asunshion,asunsion,asunsioni,asunsiyona,asusi'ona,aswnsywn,xa sun si xxng,ya song sen,Ασουνθιόν,Ασουνσιόν,Асунсион,Асунсьйон,Асунсьон,Горад Асунсьён,Ասունսյոն,אסונסיאן,אסונסיון,آسونسیون,أسونسيون,ئاسۇنسىئون,اسنشن,اسونسیون,आसुन्सियोन,ਅਸੂੰਸੀਓਨ,அசுன்சியோன்,ಅಸೂನ್‌ಸಿಯಾನ್,อะซุนซิออง,ཨ་སུན་སི་འན།,ასუნსიონი,አሱንሲዮን,アスンシオン,亞松森,아순시온"),
- new City("290030", "Doha", 25.27932, 51.52245, "QA", 344939, -9999, "Asia/Qatar", "Ad Dawha,Ad Dawhah,Ad Dawḩa,Ad Dawḩah,Ad Doha,Ad Dowhah,Ad-Dauha,Ad-Dawhah,Ad-Dawḩah,DOH,Daeuha,Dauha,Dauhá,Dawha,Dawhat al Qatar,Dawḥa,Dawḩat al Qaţar,Doha,Doho,Dokha,Dokhae,Doḥa,Däuha,Gorad Dokha,Ntocha,aaldawhat,aldwht,deaha,do ha,doha,dohara,duo ha,dwha,dwhh,toka,Ντόχα,Горад Доха,Дохæ,Доха,Доҳа,Դոհա,דוחא,דוחה,الدوحة,اَلدَّوْحَة,دوحه,دوحہ,دوها,دوھا,دەوحە,दोहा,দোহা,দোহার,ਦੋਹਾ,தோகா,ದೊಹಾ,ദോഹ,โดฮา,དྷོ་ཧ།,დოჰა,ዶሃ,ドーハ,多哈,도하"),
- new City("935264", "Saint-Denis", -20.88231, 55.4504, "RE", 137195, -9999, "Indian/Reunion", "Saint-Denis,Saint-Denis de la Reunion,Saint-Denis de la Réunion,Sen-Deni,St. Denis,snt dnys,Сен-Дени,סנט דניס,サン・ドゥニ"),
- new City("683506", "Bucharest", 44.43225, 26.10626, "RO", 1877155, -9999, "Europe/Bucharest", "BUH,Boekarest,Boukouresti,Bucarest,Bucaresta,Bucareste,Bucarèst,Bucharest,Bucuresti,Bucureşti,Buekres,Bukarest,Bukarestas,Bukareste,Bukaresto,Bukareszt,Bukareŝto,Bukareštas,Bukharest,Bukureshh,Bukuresht,Bukuresht',Bukureshta,Bukureshti,Bukurest,Bukurešt,Bukurešť,Buxarest,Búkarest,Bûkarest,Bükreş,bkharst,bu jia lei si te,bukaresuto,bukulesyuti,bwkharst,bwqrst,Βουκουρέστι,Букурешт,Букурешть,Букурещ,Бухарест,Բուխարեստ,בוקאַרעשט,בוקרשט,بخارست,بوخارست,بۇخارېست,པུ་ཁ་རེ་སིད,ბუქარესტი,ቡካረስት,ブカレスト,布加勒斯特,부쿠레슈티"),
- new City("792680", "Belgrade", 44.80401, 20.46513, "RS", 1273651, -9999, "Europe/Belgrade", "BEG,Belehrad,Belgrad,Belgrada,Belgradas,Belgrade,Belgrado,Belgradu,Belgradum,Belgrau,Belgrað,Belgrád,Belgráu,Beligradi,Belohrod,Beograd,Beogradi,Beogrado,Bèlgrade,Bělehrad,Běłohród,Nandorfehervar,Nándorfehérvár,Singidunum,be-ogeuladeu,bei er ge lai de,belgradi,beogurado,blghrad,blgrd,pelkiret,Βελιγράδι,Белград,Београд,Бѣлъ Градъ · Срьбїи,Բելգրադ,בלגרד,بلغراد,بېلگراد,பெல்கிறேட்,ბელგრადი,በልግራድ,ベオグラード,贝尔格莱德,베오그라드"),
- new City("524901", "Moscow", 55.75222, 37.61556, "RU", 10381222, -9999, "Europe/Moscow", "Gorad Maskva,MOW,Maeskuy,Maskav,Maskava,Maskva,Mat-xco-va,Matxcova,Matxcơva,Mosca,Moscfa,Moscha,Mosco,Moscou,Moscova,Moscovo,Moscow,Moscoƿ,Moscu,Moscua,Moscòu,Moscó,Moscù,Moscú,Moskva,Moska,Moskau,Mosko,Moskokh,Moskou,Moskov,Moskova,Moskow,Moskowa,Mosku,Moskuas,Moskva,Moskvo,Moskwa,Moszkva,Muskav,Musko,Mát-xcơ-va,Mòskwa,Məskəү,masko,maskw,mo si ke,moseukeuba,mosko,mosukuwa,mskw,mwskva,mwskw,mwsqbh,mx s ko,Μόσχα,Горад Масква,Мæскуы,Маскав,Москва,Москова,Москох,Москъва,Мускав,Муско,Мәскәү,Մոսկվա,מאָסקװע,מאסקווע,מוסקבה,ماسکو,مسکو,موسكو,موسكۋا,ܡܘܣܩܒܐ,मास्को,मॉस्को,মস্কো,மாஸ்கோ,มอสโก,མོ་སི་ཁོ།,მოსკოვი,ሞስኮ,モスクワ,莫斯科,모스크바"),
- new City("202061", "Kigali", -1.94995, 30.05885, "RW", 745261, -9999, "Africa/Kigali", "KGL,Kigale,Kigali,Kigalis,Kinkali,Kígalí,ji jia li,kigalli,kigari,Κιγκάλι,Кигали,קיגאלי,ኪጋሊ,キガリ,吉佳利,키갈리"),
- new City("108410", "Riyadh", 24.68773, 46.72185, "SA", 4205961, -9999, "Asia/Riyadh", "Al-Riyad,Ar Riyad,Ar Riyadh,Ar Riyādh,Ar Riyāḑ,Ar-Riyad,Ar-Riyod,Ar-Riyāḑ,Ehr-Rijad,Er Riad,Er-Rijad,Gorad Ehr-Ryjad,RUH,Riaad,Riad,Riade,Riadi,Riado,Riadum,Riant,Rihad,Rijad,Rijada,Rijadas,Rijád,Rijāda,Riyad,Riyadh,Ríad,alryad,er-riadi,li ya de,liyadeu,ri'ada,ri'adha,riyad,riyada,riyadh,riyadha,riyado,riyat,ryad,ryyad,Ər-Riyad,Ριάντ,Горад Эр-Рыяд,Ер-Ріяд,Рияд,Ријад,Эр-Рияд,Էր Ռիադ,ריאד,الرياض,رىياد,رياض,ریاض,ڕیاز,रियाद,रियाध,রিয়াদ,ਰਿਆਧ,ରିଆଦ,ரியாத்,ರಿಯಾಧ್,റിയാദ്,ริยาด,རིས་ཡག,ერ-რიადი,ሪያድ,リヤド,利雅德,리야드"),
- new City("2108502", "Honiara", -9.43333, 159.95, "SB", 56298, -9999, "Pacific/Guadalcanal", "HIR,Honiara,Honiaro,Khoniara,Oniara,ho ni xa ra,honiala,honiara,huo ni ya la,hwnyara,Ονιάρα,Хониара,הוניארה,هونيارا,هونیارا,โฮนีอารา,ሆኒያራ,ホニアラ,霍尼亚拉,霍尼亞拉,호니아라"),
- new City("241131", "Victoria", -4.61667, 55.45, "SC", 22881, -9999, "Indian/Mahe", "Biktoria,Mahe,Mahé,Port Victoria,Victoria,Victòria,Viktoria,Viktorija,bigtolia,vu~ikutoria,Βικτόρια,Виктория,وکٹوریا,ቪክቶሪያ፥ ሲሸልስ,ヴィクトリア,빅토리아"),
- new City("379252", "Khartoum", 15.55177, 32.53241, "SD", 1974647, -9999, "Africa/Khartoum", "Al Khartum,Al Kharţūm,Al Khurtum,Al Khurţūm,Cartum,Cartúm,Chartoum,Chartum,Chartumas,Chartúm,Hartum,Hartumo,Jartum,KRT,Kartum,Kartúm,Khartoem,Khartoum,Khartoun,Khartum,Khartun - alkhrtwm,Khartún - الخرطوم,haleutum,harutsumu,hrtwm,karttaum,ke tu mu,khartwm,khrtwm,Ĥartumo,Χαρτούμ,Картум,Хартум,חרטום,خارطوم,خرطوم,கார்த்தௌம்,ཁར་ཏུམ,ካርቱም,ハルツーム,喀土穆,하르툼"),
- new City("2673730", "Stockholm", 59.33258, 18.0649, "SE", 1253309, -9999, "Europe/Stockholm", "Estocolm,Estocolme,Estocolmo,Estocòlme,Estokolmo,Gorad Stakgol'm,Holmia,STO,Stjokolna,Stoccholm,Stoccolma,Stockholbma,Stockholm,Stocolm,Stocolma,Stocòlma,Stocólma,Stokcholme,Stokgol'm,Stokgol'm osh,Stokgolm,Stokhol'm,Stokholm,Stokholma,Stokholmas,Stokholmi,Stokholmo,Stokkholm,Stokkholmur,Stokkhólmur,Stokkolma,Stokol'ma,Stokolm,Stuculma,Stócólm,Sztokholm,Sztokhòlm,Tukholma,astkhlm,seutogholleum,si de ge er mo,stak'hom,stakahoma,stokahoma,stwkhwlm,stwqhwlm,stxkholm,sutokkuhorumu,Štokholm,Στοκχόλμη,Горад Стакгольм,Стокhольм,Стокгольм,Стокгольм ош,Стокольма,Стокхолм,Стокҳолм,Стёколна,Ստոքհոլմ,סטוקהולם,שטאקהאלם,استکهلم,ستوكهولم,ستۆکھۆڵم,سٹاکہوم,ܣܛܘܩܗܘܠܡ,स्टॉकहोम,স্টকহোম,ஸ்டாக்ஹோம்,സ്റ്റോക്ക്‌ഹോം,สตอกโฮล์ม,སི་ཏོག་ཧོ་ལིམ།,စတော့ဟုမ်းမြို့,სტოკჰოლმი,ስቶኮልም,ᔅᑑᒃᓱᓪᒻ/stuukhulm,ストックホルム,斯德哥尔摩,스톡홀름,𐍃𐍄𐌿𐌺𐌺𐌰𐌷𐌿𐌻𐌼𐍃"),
- new City("1880252", "Singapore", 1.28967, 103.85007, "SG", 3547809, -9999, "Asia/Singapore", "SIN,Singapore,Singapore City,Singapour,Singapur,Singapura,Sinkapoure,Tumasik,singkh por,Σιγκαπούρη,Сингапур,สิงค์โปร"),
- new City("3370903", "Jamestown", -15.93872, -5.71675, "SH", 637, 10, "Atlantic/St_Helena", "Jamestown"),
- new City("3196359", "Ljubljana", 46.05108, 14.50513, "SI", 255115, -9999, "Europe/Ljubljana", "Aemona,Gorad Ljubljana,Jubaljana,L'yublyana,LJU,Laibach,Laiboch,Lioumpliana,Liubliana,Liublianne,Liuibleana,Liúibleána,Ljubljana,Ljubljanae,Ljubljano,Lubian-a,Lubiana,Lubiane,Lubiann-a,Lubjana,Lublan,Lublana,Lublaň,Lubliano,Lubljana,Luebiana,Lueblaen,Lueblana,Lyoubyana,Lyublyana,Lübiana,Lüblâna,Lüblän,li'ubali'ana,li'ubliyana,liubliana,liyubliyana,liyupliyana,lu bu er ya na,lub li ya na,lyubeullyana,lywblyana,ryuburyana,Ļubļana,Ľubľana,Łubiana,Λιουμπλιάνα,Љубљана,Горад Любляна,Люблянæ,Любляна,Люблꙗна,Լյուբլյանա,ליובליאנה,ليوبليانا,ليۇبليانا,لیوبلیانا,लियुब्लियाना,লিউব্লিয়ানা,ਲਿਊਬਲਿਆਨਾ,லியுப்லியானா,ลูบลิยานา,ལི་པོ་ཡ་ན།,ლიუბლიანა,ልዩብልያና,リュブリャナ,卢布尔雅那,류블랴나"),
- new City("2729907", "Longyearbyen", 78.2186, 15.64007, "SJ", 2060, -9999, "Arctic/Longyearbyen", "Gorad Longjir,LYR,Long'ir,Longijur,Longjerbiene,Longjerbīene,Longjir,Longjyrbienas,Longyearbyen,Longyearbyur,Longyearbýur,Lonqyirbyuen,lang yi er cheng,langayrbyn,long-wiealeubwien,longiri,lwnghyarbyyn,lxng yeiy r beiyn,rongui~erubin,Горад Лонгйір,Лонг'їр,Лонгийър,Лонгйир,Лонгьир,לונגיירביאן,لانگایربین,لونغياربيين,ลองเยียร์เบียน,ლონგირი,ロングイェールビーン,朗伊爾城,롱위에아르뷔엔"),
- new City("3060972", "Bratislava", 48.14816, 17.10674, "SK", 423737, -9999, "Europe/Bratislava", "An Bhrataslaiv,An Bhratasláiv,BTS,Bratislav,Bratislava,Bratislavae,Bratislavo,Bratislawa,Bratisllava,Bratisława,Bratyslawa,Bratysława,Bratîslava,Gorad Bracislava,Mpratislaba,Posonium,Pozsony,Presburg,Presporok,Prespurk,Pressburg,Preszburg,Preßburg,Prešporok,Prešpurk,baratisalava,beulatiseullaba,bra ti sla wa,bratislabha,bratislava,bratislavha,bratslawa,bratsylava,bratyslafa,bratyslava,bratyslaw,bratyslawa,bu la di si la fa,burachisuravu~a,pirattislava,Μπρατισλάβα,Братислав,Братиславæ,Братислава,Братіслава,Братїслава,Горад Браціслава,Բրատիսլավա,בראטיסלאווא,ברטיסלאבה,براتسلاوا,براتسیلاڤا,براتىسلاۋا,براتيسلافا,براتیسلاو,براتیسلاوا,براٹیسلاوا,ܒܪܛܝܣܠܐܒܐ,ब्रातिस्लाव्हा,ব্রাতিস্লাভা,ਬਰਾਤੀਸਲਾਵਾ,பிராத்திஸ்லாவா,ಬ್ರಾಟಿಸ್ಲಾವಾ,ബ്രാട്ടിസ്‌ലാവ,บราติสลาวา,བ་ར་ཏིསི་ལ་བ།,ბრატისლავა,ብራቲስላቫ,ブラチスラヴァ,布拉迪斯拉发,브라티슬라바"),
- new City("2409306", "Freetown", 8.484, -13.22994, "SL", 802639, -9999, "Africa/Freetown", "FNA,Freetown,Frijtaun,Fritaun,Fritauna,Fritaunas,Fritauno,Fritaŭno,Fritonn,Frītauna,Gorad Frytaun,Libera Urbs,Phritaoun,Saint George,farita'una,fri thawn,frytawn,fu li dun,furitaun,peulitaun,phrita'una,piritavun,zi you shi,Φρίταουν,Горад Фрытаўн,Фрийтаун,Фритаун,Фрітаун,Ֆրիթաուն,פריטאון,فريتاون,فری ٹاؤن,فری‌تاون,फ्रीटाउन,ਫ਼ਰੀਟਾਊਨ,பிரீடவுன்,ฟรีทาวน์,ཕིརི་ཊའུན།,ფრიტაუნი,ፍሪታውን,フリータウン,弗里敦,自由市,프리타운"),
- new City("3168070", "San Marino", 43.93667, 12.44639, "SM", 4500, -9999, "Europe/San_Marino", "Citta di San Marino,Città di San Marino,Ciudad de San Marino,Ciutat de San Marino,SAI,Saint-Marin,San Marinas,San Marino,San Marino Citta,San Marino Città,San Marino by,San Maríno,San-Marino,Sao Marino,São Marino,Zsita de San Marin,Zsità de San Marin,san marynw almdynt,sanmalino si,sanmarino,sanmarino shi,sn mrynw,Сан-Марино,סן מרינו,سان مارينو المدينة,サンマリノ,サンマリノ市,산마리노 시"),
- new City("2253354", "Dakar", 14.6937, -17.44406, "SN", 2476400, -9999, "Africa/Dakar", "DKR,Dacar,Dacár,Dakar,Dakara,Dakaras,Dakaro,Gorad Dakar,Ndakaaru,Ntakar,da ka er,dakaleu,dakar,dakara,dakaru,dqr,takkar,Ντακάρ,Горад Дакар,Дакар,Դակար,דאקאר,דקר,داكار,داکار,ڈا کار,ڈاکار,डकार,ডাকার,டக்கார்,ഡാക്കർ,ดาการ์,ཌ་ཀར།,დაკარი,ዳካር,ダカール,達喀爾,다카르"),
- new City("53654", "Mogadishu", 2.03711, 45.34375, "SO", 2587183, -9999, "Africa/Mogadishu", "Gorad Magadysha,MGQ,Magadiscio,Maqdishu,Mogadiisho,Mogadis,Mogadisas,Mogadischu,Mogadiscio,Mogadish,Mogadisho,Mogadishu,Mogadisjoe,Mogadisju,Mogadisjû,Mogadiso,Mogadiss,Mogadisu,Mogadisxo,Mogadiszu,Mogadixo,Mogadiŝo,Mogadişu,Mogadiš,Mogadišas,Mogadišo,Mogadišu,Mogadíscio,Mogadīšo,Mogaidisiu,Mogaidisiú,Monkantisou,Moqadiso,Moqadişo,Moukdicho,Moukntiso,Mugadiss,Muqdisho,Muqdishow,Muqdishu,Mógadisjú,Xamar,makadisu,mo jia di xiu,mo kadi chu,mogadisho,mogadishu,mogadisu,mogadisyu,mogarisu,mokaticu,mqdyshw,mqdyshyw,mwgadyshw,mwgdysw,mwghadyshw,Μογκαντίσου,Μουκντίσο,Горад Магадыша,Могадишо,Могадишо қаласы,Могадишу,Մոգադիշո,מוגדישו,مقديشو,مقديشيو,موغادیشو,موگادیشو,مۆگادیشو,मोगादिशू,मोगादीशू,মোগাদিশু,ਮਕਦੀਸ਼ੂ,ମୋଗାଡ଼ିସୁ,மொகடிசு,โมกาดิชู,མོ་ག་དི་ཤུ།,მოგადიშო,ሞቃዲሾ,モガディシュ,摩加迪休,모가디슈"),
- new City("3383330", "Paramaribo", 5.86638, -55.16682, "SR", 223757, -9999, "America/Paramaribo", "PBM,Paramaribas,Paramaribo,Paramarimpo,baramarybw,pa la ma li bo,palamalibo,paramaribo,paramarybw,prmrybw,Παραμαρίμπο,Парамарибо,פרמריבו,باراماريبو,پاراماریبو,ፓራማሪቦ,パラマリボ,帕拉马里博,파라마리보"),
- new City("373303", "Juba", 4.85165, 31.58247, "SS", 300000, -9999, "Africa/Juba", "Djouba,Dzhuba,Goba,JUB,Juba,Uula,g'wbh,Джуба,ג'ובה"),
- new City("2410763", "São Tomé", 0.33654, 6.72732, "ST", 53300, -9999, "Africa/Sao_Tome", "Salazar,San Tome,San Tomė,San-Tome,Santo Tome,Santo Tomé,Sao Thome,Sao Tome,Sao Tomé,Sao-Tomeo,Soeo Tome,Svaety Tomas,Svätý Tomáš,Sào Thomé,São Tomé,Söo Tomé,sangtume,santome,Σάο Τομέ,Сан-Томе,Сао Томе,סאו טומה,ሳን ቶሜ,サントメ,상투메"),
- new City("3583361", "San Salvador", 13.68935, -89.18718, "SV", 525990, -9999, "America/El_Salvador", "Gorad San-Sal'vador,SAL,Salvador,San Salbador,San Salvado,San Salvador,San Salvadoras,San Salvadori,San Salvadò,San Salwador,San-Sal'vador,San-Salvadoro,Sansalvadora,Urbs Sancti Salvatoris,can calvator,san salvadwr,san salwadwr,san slfadwr,san-salvadori,sana salavadora,sana salvhadora,sansalbadoleu,sansalwadxr,sansarubadoru,sheng sa er wa duo,sn slwwdwr,Σαν Σαλβαδόρ,Горад Сан-Сальвадор,Сан Салвадор,Сан-Сальвадор,Սան Սալվադոր,סן סלוודור,سان سالوادور,سان سالۋادور,سان سلفادور,سان سلواڈور,सान साल्व्हाडोर,ਸਾਨ ਸਾਲਵਾਦੋਰ,சான் சல்வடோர்,ซันซัลวาดอร์,སན་སལ་ཝ་ཌོར།,სან-სალვადორი,ሳን ሳልቫዶር,サンサルバドル,聖薩爾瓦多,산살바도르"),
- new City("3513392", "Philipsburg", 18.026, -63.04582, "SX", 1400, -9999, "America/Lower_Princes", "Filipsburg,Great Bay,Philipsburg,Филипсбург"),
- new City("170654", "Damascus", 33.5102, 36.29128, "SY", 1569394, -9999, "Asia/Damascus", "Al-Sham,Al-Shām,Cham,DAM,Damas,Damasc,Damasco,Damascu,Damascus,Damasek,Damask,Damask,Damaskas,Damasko,Damaskos,Damaskus,Damaszek,Damašek,Dammeseq,Dimaejk,Dimashk,Dimashk al-Sham,Dimashk al-Shām,Dimashq,Dimeshki esh Sham,Dimishq,Dimäjk,Esh Sham,Esh Shām,Sam,da ma shi ge,damaseukuseu,damasukasu,dmshq,dmsq,drmswq,Şam,Δαμασκός,Дамаск,Дамаскъ,Димишқ,Դամասկոս,דמשק,دمشق,ܕܪܡܣܘܩ,ደማስቆ,ダマスカス,大马士革,다마스쿠스"),
- new City("934985", "Mbabane", -26.31667, 31.13333, "SZ", 76218, -9999, "Africa/Mbabane", "Mbabane,Mbabano,Mbabanė,Mpampane,QMN,eumbabane,mbbnh,mo ba ben,mubabane,Μπαμπάνε,Мбабане,מבבנה,ምባባኔ,ムババーネ,墨巴本,음바바네"),
- new City("3576994", "Cockburn Town", 21.46122, -71.14188, "TC", 3720, -9999, "America/Grand_Turk", "Cockburn Town"),
- new City("2427123", "N'Djamena", 12.10672, 15.0444, "TD", 721081, -9999, "Africa/Ndjamena", "Fort-Lamy,Lamy,N'Djamena,NDJ,Ndjamena,Ndjemena,Ndzamena,Ndzhamena,Ndżamena,Ndžamena,Njameno,Nĵameno,N’Djamena,N’Dj·amèna,Tzamena,Yamena,anjmyna,en jia mei na,eunjamena,ng'mnh,njamena,Τζαμένα,Нджамена,נג'מנה,أنجمينا,ንጃሜና,ンジャメナ,恩賈梅納,은자메나"),
- new City("1546102", "Port-aux-Français", -49.35, 70.21667, "TF", 45, -9999, "Indian/Kerguelen", "Port-o-Franseh,Порт-о-Франсэ"),
- new City("2365267", "Lomé", 6.13748, 1.21227, "TG", 749700, -9999, "Africa/Lome", "Gorad Lameh,LFW,Lome,Lomee,Lomeo,Lomé,Lomė,lome,luo mei,lwm,lwmh,lwmy,lwmyh,rome,Λομέ,Горад Ламэ,Ломе,Լոմե,לומה,لوم,لومه,لومي,لوميه,لومې,لومے,لۆمێ,लोमे,ਲੋਮੇ,லோமே,โลเม,ལཱོ་མེ།,ლომე,ሎሜ,ロメ,洛美,로메"),
- new City("1609350", "Bangkok", 13.75398, 100.50144, "TH", 5104476, -9999, "Asia/Bangkok", "Amphoe Phra Nakhon,BKK,Ban'nkok,Bancac,Bancocum,Bancác,Banghok,Bangkok,Bangkok - krungthephmhankhr,Bangkok - กรุงเทพมหานคร,Bangkok Metropolis,Bangkoka,Bangkòk,Banguecoque,Bankok,Bankokas,Bankoko,Banqkok,Changwat Phra Nakhon,Gorad Bangkok,Krung Thep,Krung Thep Maha Nakhon,Krungdeb,Man-kuk,Màn-kuk,Phra Nakhon,Siayuthia,The City of Angels,bainkaka,bainkoka,bamkoka,bangkog,bangkwk,bankeakk,bankoku,bankwk,bngqwq,bnkak,byankak,byankaka,camraata byankaka,krungtheph,krungthephmhankhr,man gu,penkak,Μπανγκόκ,Бангкок,Банкок,Баҥкок,Горад Бангкок,Բանգկոկ,באנגקאק,בנגקוק,بانكوك,بانکوک,بانکۆک,بانګکوک,بانگكوك,بنکاک,बँकॉक,बैंकक,बैंकॉक,চাংৱাত ব্যাংকক,ব্যাংকক,ਬੈਂਕਾਕ,பேங்காக்,ಬ್ಯಾಂಕಾಕ್,ബാങ്കോക്ക്,බැංකොක්,กรุงเทพ,กรุงเทพมหานคร,กรุงเทพฯ,ບາງກອກ,པན་ཀོག,ဘန်ကောက်မြို့,ბანგკოკი,ባንኮክ,バンコク,曼谷,방콕"),
- new City("1221874", "Dushanbe", 38.53575, 68.77905, "TJ", 543107, -9999, "Asia/Dushanbe", "DYU,Djuschambe,Doesjanbe,Douchanbe,Douchanbé,Dusanbe,Dusanbeo,Duschanbe,Dushambe,Dushanbe,Dusjanbe,Duszanbe,Duŝanbeo,Duşanbe,Dušanbe,Dušanbė,Dušhanbe,Dyushambe,Düşənbə,Jushambe,Ntousanmpe,Stalinabad,do~ushanbe,du shang bie,dusyanbe,dwshnbh,dwsnbh,Ντουσάνμπε,Душанбе,דושנבה,دوشنبه,ዱሻንቤ,ドゥシャンベ,杜尚别,두샨베"),
- new City("1645457", "Dili", -8.55861, 125.57361, "TL", 150000, -9999, "Asia/Dili", "DIL,Delhi,Dilhi,Dili,Dilis,Dilli,Dilly,Dilo,Dily,Díli,Nova Dili,di li,dilli,diri,dyly,Дили,דילי,ディリ,帝力,딜리"),
- new City("162183", "Ashgabat", 37.95, 58.38333, "TM", 727700, -9999, "Asia/Ashgabat", "ASB,Achgabat,Achkhabad,Aschabad,Aschabadas,Aschchabad,Aschgabat,Asgabat,Asgabata,Asgabate,Asgabato,Ashabad,Ashabat,Ashgabad,Ashgabat,Ashkabad,Ashkhabad,Ashkhabad osh,Ashqabad,Ashxabad,Ashxobod,Asjabad,Asjchabad,Asjchabat,Asjkhabad,Askabad,Askabat,Askhabad,Asnkampat,Asqabad,Asxabad,Aszchabad,Aŝgabato,Aşgabat,Aşkabat,Aşqabad,Aşğabat,Ašchabad,Ašchabadas,Ašgabat,Ašgabata,Ašhabad,Gorad Ashkhabad,Ishkˌobod,Poltoratsk,a shen ha ba de,acukapat,asagabada,asakhabada,asgabad,asgabada,asgabat,ashigabato,ashk abad,ashkhabadi,asigabateu,asqabada,xa chka bat,Ασγκαμπάτ,Ашгабат,Ашкабад,Ашхабад,Ашхабад ош,Ашғабад,Горад Ашхабад,Ишқобод,Աշխաբադ,אשגאבאט,אשגאבט,اشک آباد,عشق آباد,عشق اباد,عشق‌آباد,عیشقاباد,अश्क़ाबाद,अश्गाबाद,আশখাবাদ,ਅਸ਼ਗਾਬਾਦ,அசுகாபாத்,ಅಶ್ಗಾಬಾತ್,അഷ്ഗാബാദ്,อาชกาบัต,ཨ་ཧྲི་ཁ་པད།,აშხაბადი,አሽጋባት,アシガバート,阿什哈巴德,아시가바트"),
- new City("2464470", "Tunis", 36.81897, 10.16579, "TN", 693210, -9999, "Africa/Tunis", "Gorad Tunis,TUN,Tinis,Tuenis,Tuinis,Tunes,Tunes tamaneɣt,Tunez,Tunis,Tunis shaary,Tunis-Ville,Tunisa,Tunisas,Tunisi,Tunisin Orn,Tunisz,Tunixi,Tuniz,Tunizo,Tunus,Tynida,Tùnis,Tùnisi,Túinis,Túnez,Túnis,Túnixi,Túniz,Tûnis,Tünis,chunisu,tu ni si,tu ni si shi,tunis,tunis's,tunisa,twiniseu,twns,twnys,twwns,tyunisa,Τύνιδα,Горад Туніс,Тунис,Тунис шаары,Тунисин Орн,Туніс,Թունիս,תוניס,تونس,تونس شہر,توونس,تۇنىس شەھىرى,ٹیونس نگر,ܬܘܢܣ,ट्युनिस,ट्यूनिस,ਤੂਨਿਸ,தூனிஸ்,ടൂണിസ്സ്,ตูนิส,ཊུ་ནིསི།,ტუნისი,ቱኒስ,チュニス,突尼斯,突尼斯市,튀니스"),
- new City("4032402", "Nuku‘alofa", -21.13938, -175.2018, "TO", 22400, -9999, "Pacific/Tongatapu", "Niukalofa,Noukoualopha,Nucualofa,Nukalofa,Nuku'alofa,Nuku`alofa,Nuku`aloia,Nukualofa,Nukuʻalofa,Nuku‘alofa,Nuku‘aloia,Nuku’alofa,nu ku a luo fa,nu kuxalofa,nukuallopa,nukuarofa,Νουκουαλόφα,Нукуалофа,נוקואלופה,นูกูอะโลฟา,ኑኩአሎፋ,ヌクアロファ,努库阿洛法,努庫阿洛發,누쿠알로파"),
- new City("323786", "Ankara", 39.91987, 32.85427, "TR", 3517182, 850, "Europe/Istanbul", "ANK,Anakara,Ancara,Ancyra,Ang-ka-la,Angkara,Angora,Anguriyah,Ankar,Ankara,Ankaro,Ankuara,Ankura,Ankyra,Ankyra (Ankyra),Anqara,Enguri,Engüri,Enqere,Gorad Ankara,an ka la,angkala,ankara,anqrh,anqrt,xangkara,Ăng-kā-lá,Άγκυρα (Ankyra),Анкара,Анкъара,Горад Анкара,Әнкара,Անկարա,אנקארא,אנקרה,آنکارا,أنقرة,ئەنقەرە,انقره,انقرہ,انکرہ,ܐܢܩܪܐ,अंकारा,আঙ্কারা,ଆଙ୍କାରା,அங்காரா,అంకారా,ಅಂಕಾರಾ,അങ്കാറ,อังการา,ཨན་ཁ་ར།,ანკარა,አንካራ,アンカラ,安卡拉,앙카라"),
- new City("3573890", "Port-of-Spain", 10.66617, -61.51657, "TT", 49031, -9999, "America/Port_of_Spain", "City of Port-of-Spain,Port of Spain,Port of Speinas,Port of Spejn,Port oph Spein,Port-au-Spain,Port-d'Espagne,Port-of-Spain,Port-of-Spejn,Puerto Espana,Puerto España,poteu obeu seupein,poteuobeuseupein,potoobusupein,xi ban ya gang,Πορτ οφ Σπέιν,Порт оф Спејн,Порт-оф-Спейн,פורט אוף ספיין,ፖርት ኦፍ ስፔን,ポートオブスペイン,西班牙港,포트 오브 스페인,포트오브스페인"),
- new City("2110394", "Funafuti", -8.52425, 179.19417, "TV", 4492, -9999, "Pacific/Funafuti", "FUN,Fongafale,Fongafale (atolon de Funafuti),Fongafale (atolón de Funafuti),Funafuti,Phounaphouti,Φουναφούτι"),
- new City("1668341", "Taipei", 25.04776, 121.53185, "TW", 7871900, -9999, "Asia/Taipei", "GJai Bac,Kota Taipei,Pan Kiao,Pan-ch'iao,Pan-ch'iao-chen,Pan-ch'iao-chieh,Pan-ch’iao,Pan-ch’iao-chen,Pan-ch’iao-chieh,T'ai-pei,T'ai-pei Shih,T'ai-pei-hsien,TPE,Taibei Shi,Taibei Shih,Taibejus,Taibėjus,Taipe,Taipeh,Taipei,Taipeium,Taipejus,Taipé,Taipéi,Taipėjus,Tajbehj,Tajpej,Tajpeo,Tayipeh,Tayipèh,Tchaj-pej,T’ai-pei,T’ai-pei Shih,T’ai-pei-hsien,ta'ipe,tai bei shi,taibei,taibei si,thipe,Đài Bắc,Ταϊπέι,Тайбэй,Тайпей,Тајпеј,טאיפי,טאיפיי,تەيبېي,ताइपे,ไทเป,ཐའེ་པེ,ታይፔ,台北市,臺北市,타이베이,타이베이 시"),
- new City("160196", "Dodoma", -6.17221, 35.73947, "TZ", 180541, -9999, "Africa/Dar_es_Salaam", "DOD,Dodoma,Dodomao,Dódóma,Idodoma,dodoma,duo duo ma,dwdwma,dwdwmh,Додома,דודומה,دودوما,डोडोमा,ዶዶማ,ドドマ,多多马"),
- new City("703448", "Kiev", 50.45466, 30.5238, "UA", 2514227, -9999, "Europe/Kiev", "Chijv,Civ,Cív,Gorad Kieu,IEV,Kaenugardur,Keju,Kiebo,Kief,Kieu,Kiev,Kiev osh,Kievi,Kievo,Kiew,Kiiev,Kiiv,Kijev,Kijeva,Kijevas,Kijew,Kijow,Kijuw,Kijv,Kijów,Kijůw,Kiova,Kiovia,Kiyev,Kiyiw,Kiëf,Kjiv,Kueyiv,Kyev,Kyiiv,Kyiv,Kyjev,Kyjiv,Kyjiw,Kyèv,Kænugarður,Kíev,Kîev,Küyiv,ji fu,kheiyf,kiefu,kiv,kiva,kiyebha,kiyepeu,kyf,kyiva,kyyf,qyyb,Κίεβο,Горад Кіеў,Кейӳ,Киев,Киев ош,Київ,Кијев,Кыив,Кыйив,Кꙑѥвъ,Կիև,קייב,קיעוו,كىيېۋ,كييف,کیف,کیێڤ,کی‌یف,कीव,क्यीव,কিয়েভ,கீவ்,കീവ്,เคียฟ,ཀིབ།,ကီးယက်မြို့,კიევი,ኪየቭ,キエフ,基輔,키예프"),
- new City("232422", "Kampala", 0.31628, 32.58219, "UG", 1353189, -9999, "Africa/Kampala", "Campala,KLA,Kampala,Kampalo,kampala,kampalla,kan pa la,kanpara,kmbala,qmplh,Καμπάλα,Кампала,Կամպալա,קמפלה,كمبالا,کامپالا,कम्पाला,ካምፓላ,カンパラ,坎帕拉,캄팔라"),
- new City("4140963", "Washington, D. C.", 38.89511, -77.03637, "US", 601723, 7, "America/New_York", "Ouasinkton,Vashington,Vasingtonia,WAS,Washington,Washington D.C.,Washington DC,Waszyngton,Ουάσιγκτον,Вашингтон"),
- new City("3441575", "Montevideo", -34.83346, -56.16735, "UY", 1270737, -9999, "America/Montevideo", "Ciudad de Montevideo,Gorad Mantehvideha,MVD,Monsvideus,Montebideo,Montevidejas,Montevideo,Montevideu,Montevidéu,Montevidėjas,Montevídeó,Muntivideu,Muntividew,Muntividèu,Muntividëw,meantevidiyea,meng de wei de ya,meng te wei duo,montebide'o,montebide-o,montebideo,montevide'o,montevidi'o,montevidiyo,mwntyfydyw,mxn te wi de xo,Μοντεβιδέο,Горад Мантэвідэа,Монтевидео,Монтевідео,Մոնտեվիդեո,מאנטעווידעא,מונטווידאו,مونته‌ویدئ,مونته‌ویدئو,مونتيفيديو,مونتېۋىدېئو,مونٹیویڈیو,मोण्टेवीडियो,मोन्तेविदेओ,মোন্তেবিদেও,ਮੋਂਤੇਵੀਦਿਓ,മൊണ്ടേവീഡിയോ,มอนเตวิเดโอ,མཱོན་ཊི་ཝི་ཌོ།,မွန်တီဗစ်ဒီအိုမြို့,მონტევიდეო,ሞንቴቪዴዎ,モンテビデオ,蒙得维的亚,蒙特維多,몬테비데오"),
- new City("1512569", "Tashkent", 41.26465, 69.21627, "UZ", 1978028, -9999, "Asia/Tashkent", "Daskent,Daşkent,Daşkənd,Gorad Tashkent,Lithopolis,TAS,Ta.kent,Tachkent,Tachkènt,Taixkent,Taschkent,Tashken,Tashkend,Tashkent,Tashkent osh,Tashkenti,Tasjkent,Taskende,Taskent,Taskenta,Taskentas,Taskento,Taszkent,Taxkent,Taŝkento,Taşkent,Taškent,Taškenta,Taškentas,Tașkent,Tochkent,Toshkand,Toshkent,Toshkent shahri,ta shen gan,tasakada,tasakanda,tasakhanda,tashknd,tashqnd,tashukento,taskanda,taskanr,taskantu,taskent,tasyukenteu,thach khen t,tshqnd,tsqnt,Τασκένδη,Горад Ташкент,Ташкен,Ташкент,Ташкент ош,Тошканд,Տաշքենդ,טאשקענט,טשקנט,تاشقند,تاشكند,تاشكەنت,تاشکند,تاشکەند,طشقند,ताशकन्द,ताश्कंद,তাশখন্দ,ਤਾਸ਼ਕੰਦ,தாஷ்கந்து,తాష్కెంట్,ತಾಷ್ಕೆಂಟ್,താഷ്കന്റ്,ทาชเคนต์,ཐ་ཧྲི་ཀན།,ტაშკენტი,ታሽኬንት,タシュケント,塔什干,타슈켄트"),
- new City("6691831", "Vatican City", 41.90236, 12.45332, "VA", 829, 55, "Europe/Vatican", "Citta del Vaticano,Città del Vaticano,Ciudad del Vaticano,Vatican,Vaticano,Vatikan,Vatikanstaden,Ватикан"),
- new City("3577887", "Kingstown", 13.15872, -61.22475, "VC", 24518, -9999, "America/St_Vincent", "Kin'nkstaoun,Kingstaun,Kingstaunas,Kingstown,SVD,kingseutaun,kingusutaun,kynghstawn,Κινγκστάουν,Кингстаун,קינגסטאון,كينغستاون,ኪንግስታውን,キングスタウン,킹스타운"),
- new City("3646738", "Caracas", 10.48801, -66.87919, "VE", 3000000, -9999, "America/Caracas", "CCS,Caracae,Caracas,Caraques,Gorad Karakas,Karakas,Karakasa,Karakasas,Karakaso,ka la ka si,ka raka s,kalakaseu,karakas,karakasa,karakasu,krakas,kraks,Καράκας,Горад Каракас,Каракас,Կարակաս,קאראקאס,קראקס,كراكاس,کاراکاس,کراکس,काराकास,কারাকাস,ਕਾਰਾਕਾਸ,કારાકાસ,କାରାକାସ,கரகஸ்,ಕರಾಕಸ್,การากัส,ཁ་ར་ཁ་སི,ကရာကက်စ်မြို့,კარაკასი,ካራካስ,カラカス,卡拉卡斯,카라카스"),
- new City("3577430", "Road Town", 18.41667, -64.61667, "VG", 8449, 9, "America/Tortola", "Road Town,rodotaun,רואוד טאון,ロードタウン"),
- new City("4795467", "Charlotte Amalie", 18.3419, -64.9307, "VI", 20000, 6, "America/St_Thomas", "Charlotte Amalie,Sharlota Amalija,Шарлота Амалия,Шарлота Амалија,שארלוט אמאלי,シャーロット・アマリー"),
- new City("1581130", "Hà Nội", 21.0245, 105.84117, "VN", 1431270, -9999, "Asia/Ho_Chi_Minh", "Anoi,HAN,Ha Noi,Hanoi,Hanoj,Hanojo,Hanojus,Hanoï,Hanói,Hà Nội,Keicho,Khanoj,hanoi,hanwy,hanxy,he nei,Ανόι,Ханой,האנוי,هانوي,هانوی,ฮานอย,ሀኖይ,ハノイ,河內,하노이"),
- new City("2135171", "Port-Vila", -17.73381, 168.32188, "VU", 35901, -9999, "Pacific/Efate", "Bila,Fila,Port Fila,Port Vila,Port-Vila,VLI,Vila,poteubilla,potobira,pwrt wylh,wei la gang,Βίλα,Порт Вила,Порт-Вила,פורט וילה,ፖርት ቪላ,ポートビラ,維拉港,포트빌라"),
- new City("4034821", "Mata-Utu", -13.28163, -176.17453, "WF", 1200, -9999, "Pacific/Wallis", "Gorad Mata-Utu,Mata Utu,Mata'utu,Mata-Outou,Mata-Utu,Matauto,Matâ'utu,Matāʻutu,ma ta wu tu,mata-atw,mata-xu tu,matauto~u,matautu,Μάτα-Ούτου,Горад Мата-Уту,Мата-Уту,ماتا-اتو,มาตา-อูตู,მატა-უტუ,マタウトゥ,马塔乌图,마타우투"),
- new City("4035413", "Apia", -13.83333, -171.76666, "WS", 40407, -9999, "Pacific/Apia", "APW,Apia,Apiae,Apija,Apio,Apiya,Apía,Gorad Apija,a pi ya,abya,api'a,apia,apiya,apya,xa pi xa,΄Aπια,Απία,Апиæ,Апиа,Апия,Апија,Апіа,Горад Апія,אפיה,آپیا,أبيا,आपिया,ਆਪੀਆ,അപിയ,อาปีอา,ཨ་པི་ཡ།,აპია,አፒያ,アピア,阿皮亚,아피아"),
- new City("786714", "Pristina", 42.67272, 21.16688, "XK", 550000, -9999, "Europe/Belgrade", "Gorad Pryshcina,PRN,Prishhina,Prishtina,Prishtinae,Prishtine,Prishtinë,Prisjtina,Pristina,Pristine,Pristino,Prisztina,Prixtina,Priŝtino,Priştina,Priştine,Priština,Priștina,Prìstina,Prístina,bryshtyna,peulisyutina,phrich ti na,piristina,prisatina,pristina,pryshtyna,prystynh,pu li shen di na,purishutina,Πρίστινα,Горад Прышціна,Приштинæ,Приштина,Прищина,Պրիշտինա,פרישטינה,بريشتينا,پریسٹینہ,پریشتینا,प्रिस्टिना,ਪ੍ਰਿਸ਼ਤੀਨਾ,பிரிஸ்டினா,พริชตีนา,པི་རི་སི་ཊི་ན།,პრიშტინა,プリシュティナ,普里什蒂纳,프리슈티나"),
- new City("71137", "Sanaa", 15.35472, 44.20667, "YE", 1937451, -9999, "Asia/Aden", "SAH,Sano,San'a,San'a',San'ah,San`a',Sana,Sana'a,Sanaa,Sanaà,Sanaá,Saná,San’ah,sa na,sana,sanua,Şan‘ā',Şan‘ā’,Σάνα,Сана,Санъо,צנעא,صنعاء,ሳና,サヌア,萨那,사나"),
- new City("921815", "Mamoudzou", -12.77944, 45.22722, "YT", 54831, -9999, "Indian/Mayotte", "Mambutzou,Mamoudzou,Mamoutzou,Mamudzu,Mamutzu,Мамудзу"),
- new City("964137", "Pretoria", -25.74486, 28.18783, "ZA", 1619438, -9999, "Africa/Johannesburg", "Gorad Prehtoryja,IPitoli,PRY,Praetoria,Pretori,Pretoria,Pretoria/Pole tou Akroteriou,Pretorija,Pretorio,Pretoriya,Pretoriye,Pretoría,Pretòria,Pretória,Prétoriye,Pta,Tshwane,bi lei tuo li ya,brytwrya,peulitolia,phri thx reiy,pirittoriya,pritori'a,pritoriya,prtwrya,prtwryh,puretoria,Πρετόρια,Πρετόρια/Πόλη του Ακρωτηρίου,Горад Прэторыя,Претори,Претория,Преторија,Преторія,Պրետորիա,פרטוריה,بريتوريا,پرتوریا,پریٹوریا,پرێتۆریا,प्रिटोरिया,ਪ੍ਰਿਟੋਰੀਆ,பிரிட்டோரியா,ప్రిటోరియా,พริทอเรีย,ཕི་རི་ཐོ་རི་ཡ།,პრეტორია,ፕሪቶሪያ,プレトリア,比勒陀利亞,프리토리아"),
- new City("909137", "Lusaka", -15.40669, 28.28713, "ZM", 1267440, -9999, "Africa/Lusaka", "Gorad Lusaka,LUN,Lousaka,Louzaka,Lusaca,Lusaka,Lusako,Lúsaka,Lûsaka,lu sha ka,lucakka,lusaka,lwsaka,lwsqh,lwwsaka,rusaka,Λουσάκα,Горад Лусака,Лусака,Լուսակա,לוסקה,لوساكا,لوساکا,لووساکا,لۇساكا,लुसाका,লুসাকা,ਲੁਸਾਕਾ,ଲୁସାକ,லுசாக்கா,ลูซากา,ལུ་ས་ཀ།,ლუსაკა,ሉሳካ,ルサカ,路沙卡,루사카"),
- new City("890299", "Harare", -17.82772, 31.05337, "ZW", 1542813, -9999, "Africa/Harare", "Arare,Charare,Gorad Kharareh,HRE,Harare,Hararensis Urbs,Harareo,Hararė,Kharare,Salisbury,ha la lei,halale,harare,harary,hrarh,hrary,Χαράρε,Горад Харарэ,Хараре,Հարարե,הארארה,هارارى,هراره,هراري,ھارارې,ھەرارێ,ہرارے,हरारे,ਹਰਾਰੇ,ହାରାରେ,ஹராரே,ฮาราเร,ཧ་ར་རི།,ჰარარე,ሀራሬ,ハラレ,哈拉雷,하라레")
- };
-
- static {
- // Sort'em all at class load!
- Arrays.sort(City.CAPITALS, new City.CityComparator());
- }
-}
diff --git a/api/android/sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java b/api/android/sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java
deleted file mode 100644
index f359746be1..0000000000
--- a/api/android/sample-app-capitals/src/com/mapswithme/capitals/CityDetailsActivity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/******************************************************************************
- Copyright (c) 2013, MapsWithMe GmbH All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list
- of conditions and the following disclaimer. Redistributions in binary form must
- reproduce the above copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided with the
- distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
-******************************************************************************/
-package com.mapswithme.capitals;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.TextView;
-
-import com.mapswithme.maps.api.MWMResponse;
-import com.mapswithme.maps.api.MapsWithMeApi;
-
-public class CityDetailsActivity extends Activity
-{
- public static String EXTRA_FROM_MWM = "from-maps-with-me";
-
- private TextView mName;
- private TextView mAltNames;
- private TextView mCountry;
-
- private TextView mLat;
- private TextView mLon;
- private TextView mElev;
-
- private TextView mPopulation;
- private TextView mTimeZone;
-
- private City mCity;
-
- public static PendingIntent getPendingIntent(Context context)
- {
- final Intent i = new Intent(context, CityDetailsActivity.class);
- i.putExtra(EXTRA_FROM_MWM, true);
- return PendingIntent.getActivity(context, 0, i, 0);
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.city_details_activity);
-
- mName = (TextView) findViewById(R.id.name);
- mAltNames = (TextView) findViewById(R.id.altNames);
- mCountry = (TextView) findViewById(R.id.cCode);
-
- mLat = (TextView) findViewById(R.id.lat);
- mLon = (TextView) findViewById(R.id.lon);
- mElev = (TextView) findViewById(R.id.elevation);
-
- mPopulation = (TextView) findViewById(R.id.population);
- mTimeZone = (TextView) findViewById(R.id.timeZone);
-
- findViewById(R.id.showOnMap).setOnClickListener(new OnClickListener()
- {
- @Override
- public void onClick(View v)
- {
- MapsWithMeApi
- .showPointsOnMap(CityDetailsActivity.this,mCity.getName(),
- CityDetailsActivity.getPendingIntent(CityDetailsActivity.this),mCity.toMWMPoint());
- }
- });
-
- handleIntent(getIntent());
- }
-
- @Override
- protected void onNewIntent(Intent intent)
- {
- super.onNewIntent(intent);
- handleIntent(intent);
- }
-
- private void handleIntent(Intent intent)
- {
- if (intent.getBooleanExtra(EXTRA_FROM_MWM, false))
- {
- final MWMResponse response = MWMResponse.extractFromIntent(this, intent);
- mCity = City.fromMWMPoint(response.getPoint());
-
- if (mCity != null)
- {
- mName.setText(mCity.getName());
- mAltNames.setText(mCity.getAltNames());
- mCountry.setText(mCity.getCountryCode());
-
- mLat.setText(mCity.getLat() + "");
- mLon.setText(mCity.getLon() + "");
- final String evel = mCity.getElevation() != -9999 ? String.valueOf(mCity.getElevation()) : "No Data";
- mElev.setText(evel);
-
- final String popul = mCity.getPopulation() != -1 ? String.valueOf(mCity.getPopulation()) : "No Data";
- mPopulation.setText(popul);
- mTimeZone.setText(mCity.getTimeZone());
- }
- }
- }
-}
diff --git a/api/android/site/images/dlg.png b/api/android/site/images/dlg.png
deleted file mode 100644
index 7daf2c701c..0000000000
--- a/api/android/site/images/dlg.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/README.md b/api/iOS/README.md
deleted file mode 100644
index ad0422d978..0000000000
--- a/api/iOS/README.md
+++ /dev/null
@@ -1,156 +0,0 @@
-## MapsWithMe iOS API: Getting Started
-
-### Introduction
-
-MapsWithMe offline maps API for iOS (hereinafter referred to as *API*) provides interface for client application to perform next tasks:
-
-For version 1 (supported by MapsWithMe 2.4+)
-* Open [MapsWithMe Application][linkMwm]
-* Check that [MapsWithMe][linkMwm] is installed
-* Show one or more points on offline map of [MapsWithMe][linkMwm] with *Back* button and client app name in the title
-* Come back to the client application:
- * after pressing *Back* button on the map
- * after selecting specific point on the map if user asks for more information by pressing *More Info* button in [MapsWithMe][linkMwm]
-* Open any given url or url scheme after selecting specific point on the map if user asks for more information by pressing *More Info* button in [MapsWithMe][linkMwm]
-* Automatically display [*Download MapsWithMe*][linkDownloadMWMDialog] dialog if [MapsWithMe][linkMwm] is not installed.
-
-In general, you can provide one or two way communication between your appication and MapsWithMe.
-
-Please refer to [sample application][linkSample] for demo.
-
-### Prerequisites
-
-* Your application must target at least *iOS version 4.3*
-* For two way communication, you should add unique [URL scheme][linkAppleCustomUrlSchemes] to your app (see below)
-
-### Integration
-
-First step is to clone [repository][linkRepo] or download it as an archive.
-
-When your are done you find two folders: *api* and *capitals-example*.
-First one contains .h and .m files which you need to include into your project. You can always modify them according to your needs.
-
-If you want to get results of API calls, please add unique URL scheme to your app. You can do it with [XCode][linkAddUrlScheme] or by editing Info.plist file in your project. To make things simple, use *mapswithme* keyword in scheme ID, like *my_mapswithme_scheme*, and create an unique scheme name (or use your existing one).
-*mapswithme* keyword in scheme ID simply helps API code to detect it automatically. See more details in [Apple's documentation][linkAppleCustomUrlSchemes].
-
-*capitals-example* folder contains [sample application][linkSample] which demonstrates part of API features.
-
-### API Calls Overview and HOW TO
-
-* All methods are static for *MWMApi* class, *BOOL* methods return *NO* if call is failed.
-* If id for given pin contains valid url, it will be opened from MapsWithMe after selecting *More Info* button.
- For any other content, id will be simply passed back to the caller's [*AppDelegate application:openURL:sourceApplication:annotation:*][linkAppleDelegate] method
-
-#### Open [MapsWithMe Application][linkMwm]
-
-Simply opens MapsWithMe app:
-
- + (BOOL) showMap;
-
-Example:
-
- [MWMApi showMap];
-
-#### Show specified location on the map
-
-Displays given point on a map:
-
- + (BOOL) showLat:(double)lat lon:(double)lon title:(NSString *)title and:(NSString *)idOrUrl;
-
-The same as above but using pin wrapper:
-
- + (BOOL) showPin:(MWMPin *)pin;
-
-Pin wrapper is a simple helper to wrap pins displayed on the map:
-
- @interface MWMPin : NSObject
- @property (nonatomic, assign) double lat;
- @property (nonatomic, assign) double lon;
- @property (nonatomic, retain) NSString * title;
- @property (nonatomic, retain) NSString * idOrUrl;
- - (id) initWithLat:(double)lat lon:(double)lon title:(NSString *)title and:(NSString *)idOrUrl;
- @end
-
-Example:
-
- [MWMApi showLat:53.9 lon:27.56667 title:@"Minsk - the capital of Belarus" and:@"http://wikipedia.org/wiki/Minsk"];
- …
- MWMPin * goldenGate = [[MWMPin alloc] init] autorelease];
- goldenGate.lat = 37.8195;
- goldenGate.lon = -122.4785;
- goldenGate.title = @"Golden Gate in San Francisco";
- goldenGate.idOrUrl = @"any number or string here you want to receive back in your app, or any url you want to be opened from MapsWithMe";
- [MWMApi showPin:goldenGate];
-
-#### Show any number of pins on the map
-
- + (BOOL) showPins:(NSArray *)pins;
-
-#### Receiving results of API calls
-
-When users presses *Back* button in MapsWithMe, or selects *More Info* button, he is redirected back to your app.
-Here are helper methods to obtain API call results:
-
-Returns YES if url is received from MapsWithMe and can be parsed:
-
- + (BOOL) isMapsWithMeUrl:(NSURL *)url;
-
-Returns nil if user didn't select any pin and simply pressed *Back* button:
-
- + (MWMPin *) pinFromUrl:(NSURL *)url;
-
-Example:
-
- if ([MWMApi isMapsWithMeUrl:url])
- {
- // Good, here we know that your app was opened from MapsWithMe
- MWMPin * pin = [MWMApi pinFromUrl:url];
- if (pin)
- {
- // User selected specific pin, and we can get it's properties
- }
- else
- {
- // User pressed "Back" button and didn't select any pin
- }
- }
-
-#### Check that MapsWithMe is installed
-
-Returns NO if MapsWithMe is not installed or outdated version doesn't support API calls:
-
- + (BOOL) isApiSupported;
-
-With this method you can check that user needs to install MapsWithMe and display your custom UI.
-Alternatively, you can do nothing and use built-in dialog which will offer users to install MapsWithMe.
-
-### [Sample Code][linkSample]
-
-### Support
-
-Have a bug or feature request? [Please open a new issue][linkIssues].
-
-If you have any questions, suggestions or feedbacks, please drop us a line to [api@mapswith.me][linkSupport].
-
-------------------------------------------------------------------------------------------
-### API Code is licensed under the BSD 2-Clause License
-
-Copyright (c) 2013, MapsWithMe GmbH
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[linkMwm]: http://mapswith.me/ "MapsWithMe - offline Maps of the World"
-[linkSample]: https://github.com/mapswithme/api-ios/capitals-example "Sample Application"
-[linkRepo]: https://github.com/mapswithme/api-ios/ "GitHub Repository"
-[linkAddUrlScheme]: https://raw.github.com/mapswithme/api-ios/site-resources/add_custom_url_scheme.png "How to add url scheme in XCode"
-[linkDownloadMWMDialog]: https://raw.github.com/mapswithme/api-ios/site-resources/download_mwm_dialog.png "Donwload MapsWithMe Dialog"
-[linkIssues]: https://github.com/mapswithme/api-ios/issues/ "Post a bug or feature request"
-[linkSupport]: mailto:api@mapswith.me "MapsWithMe Support Contact"
-[linkAppleCustomUrlSchemes]: http://developer.apple.com/library/ios/#DOCUMENTATION/iPhone/Conceptual/iPhoneOSProgrammingGuide/AdvancedAppTricks/AdvancedAppTricks.html#//apple_ref/doc/uid/TP40007072-CH7-SW50 "Custom URL Scheme Apple documentation"
-[linkAppleDelegate]: http://developer.apple.com/library/ios/documentation/uikit/reference/UIApplicationDelegate_Protocol/Reference/Reference.html#//apple_ref/occ/intfm/UIApplicationDelegate/application:openURL:sourceApplication:annotation: "AppDelegate Handle custom URL Schemes"
diff --git a/api/iOS/api/MapsWithMeAPI.h b/api/iOS/api/MapsWithMeAPI.h
deleted file mode 100644
index 89798c9d08..0000000000
--- a/api/iOS/api/MapsWithMeAPI.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import <Foundation/Foundation.h>
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_4_3
- #error "MapsWithMe supports iOS >= 4.3 only"
-#endif
-
-// Wrapper for a pin on a map
-@interface MWMPin : NSObject
-// [required] pin latitude and longitude
-@property (nonatomic, assign) double lat;
-@property (nonatomic, assign) double lon;
-// [optional] pin title
-@property (nonatomic, retain) NSString * title;
-// [optional] passed back to the app when pin is clicked, OR, if it's a valid url,
-// it will be opened from MapsWithMe after selecting "More Details..." for the pin
-@property (nonatomic, retain) NSString * idOrUrl;
-- (id) initWithLat:(double)lat lon:(double)lon title:(NSString *)title and:(NSString *)idOrUrl;
-@end
-
-
-// MapsWithMe API interface
-@interface MWMApi : NSObject
-
-// returns YES if url is received from MapsWithMe and can be parsed
-+ (BOOL) isMapsWithMeUrl:(NSURL *)url;
-// returns nil if user didn't select any pin and simply pressed "Back" button
-+ (MWMPin *) pinFromUrl:(NSURL *)url;
-// returns NO if MapsWithMe is not installed or outdated version doesn't support API calls
-+ (BOOL) isApiSupported;
-// Simply opens MapsWithMe app
-+ (BOOL) showMap;
-// Displays given point on a map, title and id are optional
-// If id contains valid url, it will be opened from MapsWithMe after selecting "More Details..." for the pin
-+ (BOOL) showLat:(double)lat lon:(double)lon title:(NSString *)title and:(NSString *)idOrUrl;
-// The same as above but using pin wrapper
-+ (BOOL) showPin:(MWMPin *)pin;
-// Displays any number of pins
-+ (BOOL) showPins:(NSArray *)pins;
-
-@end
diff --git a/api/iOS/api/MapsWithMeAPI.m b/api/iOS/api/MapsWithMeAPI.m
deleted file mode 100644
index dc9e33f19b..0000000000
--- a/api/iOS/api/MapsWithMeAPI.m
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import "MapsWithMeAPI.h"
-
-#define MAPSWITHME_API_VERSION 1
-
-static NSString * MWMUrlScheme = @"mapswithme://";
-
-@implementation MWMPin
-
-- (id) init
-{
- if ((self = [super init]))
- {
- self.lat = INFINITY;
- self.lon = INFINITY;
- }
- return self;
-}
-
-- (id) initWithLat:(double)lat lon:(double)lon title:(NSString *)title and:(NSString *)idOrUrl
-{
- if ((self = [super init]))
- {
- self.lat = lat;
- self.lon = lon;
- self.title = title;
- self.idOrUrl = idOrUrl;
- }
- return self;
-}
-
-- (void)dealloc
-{
- self.title = nil;
- self.idOrUrl = nil;
- [super dealloc];
-}
-@end
-
-// Utility class to automatically handle "MapsWithMe is not installed" situations
-@interface MWMNavigationController : UINavigationController
-@end
-@implementation MWMNavigationController
-- (void)onCloseButtonClicked:(id)sender
-{
- [self dismissModalViewControllerAnimated:YES];
-}
-@end
-
-
-@implementation MWMApi
-
-+ (BOOL) isMapsWithMeUrl:(NSURL *)url
-{
- NSString * appScheme = [MWMApi detectBackUrlScheme];
- return appScheme && [url.scheme isEqualToString:appScheme];
-}
-
-+ (MWMPin *) pinFromUrl:(NSURL *)url
-{
- if (![MWMApi isMapsWithMeUrl:url])
- return nil;
-
- MWMPin * pin = nil;
- if ([url.host isEqualToString:@"pin"])
- {
- pin = [[[MWMPin alloc] init] autorelease];
- for (NSString * param in [url.query componentsSeparatedByString:@"&"])
- {
- NSArray * values = [param componentsSeparatedByString:@"="];
- if (values.count == 2)
- {
- NSString * key = [values objectAtIndex:0];
- if ([key isEqualToString:@"ll"])
- {
- NSArray * coords = [param componentsSeparatedByString:@","];
- if (coords.count == 2)
- {
- pin.lat = [[NSDecimalNumber decimalNumberWithString:[coords objectAtIndex:0]] doubleValue];
- pin.lon = [[NSDecimalNumber decimalNumberWithString:[coords objectAtIndex:1]] doubleValue];
- }
- }
- else if ([key isEqualToString:@"n"])
- pin.title = [[values objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
- else if ([key isEqualToString:@"id"])
- pin.idOrUrl = [[values objectAtIndex:1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
- else
- NSLog(@"Unsupported url parameters: %@", values);
- }
- }
- // do not accept invalid coordinates
- if (pin.lat > 90. || pin.lat < -90. || pin.lon > 180. || pin.lon < -180.)
- pin = nil;
- }
- return pin;
-}
-
-+ (BOOL) isApiSupported
-{
- return [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:MWMUrlScheme]];
-}
-
-+ (BOOL) showMap
-{
- return [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[MWMUrlScheme stringByAppendingFormat:@"map?v=%d", MAPSWITHME_API_VERSION]]];
-}
-
-+ (BOOL) showLat:(double)lat lon:(double)lon title:(NSString *)title and:(NSString *)idOrUrl
-{
- MWMPin * pin = [[[MWMPin alloc] initWithLat:lat lon:lon title:title and:idOrUrl] autorelease];
- return [MWMApi showPin:pin];
-}
-
-+ (BOOL) showPin:(MWMPin *)pin
-{
- return [MWMApi showPins:[NSArray arrayWithObject:pin]];
-}
-
-+ (BOOL) showPins:(NSArray *)pins
-{
- // Automatic check that MapsWithMe is installed
- if (![MWMApi isApiSupported])
- {
- // Display dialog with link to the app
- [MWMApi showMapsWithMeIsNotInstalledDialog];
- return NO;
- }
-
- NSString * appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
- NSMutableString * str = [[NSMutableString alloc] initWithFormat:@"%@map?v=%d&appname=%@&", MWMUrlScheme, MAPSWITHME_API_VERSION,
- [appName stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-
- NSString * backUrlScheme = [MWMApi detectBackUrlScheme];
- if (backUrlScheme)
- [str appendFormat:@"backurl=%@&", [backUrlScheme stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-
- for (MWMPin * point in pins)
- {
- [str appendFormat:@"ll=%f,%f&", point.lat, point.lon];
- @autoreleasepool
- {
- if (point.title)
- [str appendFormat:@"n=%@&", [point.title stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
- if (point.idOrUrl)
- [str appendFormat:@"id=%@&", [point.idOrUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
- }
- }
-
- NSURL * url = [[NSURL alloc] initWithString:str];
- [str release];
- BOOL const result = [[UIApplication sharedApplication] openURL:url];
- [url release];
- return result;
-}
-
-+ (NSString *) detectBackUrlScheme
-{
- for (NSDictionary * dict in [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleURLTypes"])
- {
- if ([[dict objectForKey:@"CFBundleURLName"] rangeOfString:@"mapswithme" options:NSCaseInsensitiveSearch].location != NSNotFound)
- {
- for (NSString * scheme in [dict objectForKey:@"CFBundleURLSchemes"])
- {
- if ([scheme rangeOfString:@"mapswithme" options:NSCaseInsensitiveSearch].location != NSNotFound)
- return scheme;
- }
- }
- }
- NSLog(@"WARNING: No com.mapswithme.maps url schemes are added in the Info.plist file. Please add them if you want API users to come back to your app.");
- return nil;
-}
-
-// HTML page for users who didn't install MapsWithMe
-static NSString * mapsWithMeIsNotInstalledPage =
-@"<html>" \
-"<head>" \
-"<title>Please install MapsWithMe - offline maps of the World</title>" \
-"<meta name='viewport' content='width=device-width, initial-scale=1.0'/>" \
-"<meta charset='UTF-8'/>" \
-"<style type='text/css'>" \
-"body { font-family: Roboto,Helvetica; background-color:#fafafa; text-align: center;}" \
-".description { text-align: center; font-size: 0.85em; margin-bottom: 1em; }" \
-".button { -moz-border-radius: 20px; -webkit-border-radius: 20px; -khtml-border-radius: 20px; border-radius: 20px; padding: 10px; text-decoration: none; display:inline-block; margin: 0.5em; }" \
-".shadow { -moz-box-shadow: 3px 3px 5px 0 #444; -webkit-box-shadow: 3px 3px 5px 0 #444; box-shadow: 3px 3px 5px 0 #444; }" \
-".lite { color: white; background-color: #333; }" \
-".pro { color: white; background-color: green; }" \
-".mwm { color: green; text-decoration: none; }" \
-"</style>" \
-"</head>" \
-"<body>" \
-"<div class='description'><a href='http://mapswith.me' target='_blank' class='mwm'>MapsWithMe</a> app should be installed to view the map.</div>" \
-"<a href='http://mapswith.me/app?api' class='lite button shadow'>Download&nbsp;MapsWithMe&nbsp;Lite&nbsp;(free)</a>" \
-"<a href='http://mapswith.me/get?api' class='pro button shadow'>Download&nbsp;MapsWithMe&nbsp;Pro</a>" \
-"</body>" \
-"</html>";
-
-
-// For gethostbyname below
-#include <netdb.h>
-
-+ (void) showMapsWithMeIsNotInstalledDialog
-{
- UIWebView * webView = [[[UIWebView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease];
- // check that we have Internet connection and display fresh online page if possible
- if (gethostbyname("mapswith.me"))
- [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://mapswith.me/api_mwm_not_installed"]]];
- else
- [webView loadHTMLString:mapsWithMeIsNotInstalledPage baseURL:[NSURL URLWithString:@"http://mapswith.me/"]];
- UIViewController * webController = [[[UIViewController alloc] init] autorelease];
- webController.view = webView;
- webController.title = @"Install MapsWithMe";
- MWMNavigationController * navController = [[[MWMNavigationController alloc] initWithRootViewController:webController] autorelease];
- navController.navigationBar.topItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Close" style:UIBarButtonItemStyleDone target:navController action:@selector(onCloseButtonClicked:)];
-
- [[[UIApplication sharedApplication] delegate].window.rootViewController presentModalViewController:navController animated:YES];
-}
-
-@end
diff --git a/api/iOS/capitals-example/Capitals.xcodeproj/project.pbxproj b/api/iOS/capitals-example/Capitals.xcodeproj/project.pbxproj
deleted file mode 100644
index 59df6ac011..0000000000
--- a/api/iOS/capitals-example/Capitals.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,382 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- FA1792CE17784F000092B567 /* MapsWithMeAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = FA1792CC17784F000092B567 /* MapsWithMeAPI.m */; };
- FA776B4F17848A370023F7A0 /* MasterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA776B4D17848A370023F7A0 /* MasterViewController.xib */; };
- FAA484EA178108970027B232 /* 114x114.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E2178108970027B232 /* 114x114.png */; };
- FAA484EB178108970027B232 /* 144x144.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E3178108970027B232 /* 144x144.png */; };
- FAA484EC178108970027B232 /* 100x100.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E4178108970027B232 /* 100x100.png */; };
- FAA484ED178108970027B232 /* 72x72.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E5178108970027B232 /* 72x72.png */; };
- FAA484EE178108970027B232 /* 58x58.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E6178108970027B232 /* 58x58.png */; };
- FAA484EF178108970027B232 /* 57x57.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E7178108970027B232 /* 57x57.png */; };
- FAA484F0178108970027B232 /* 50x50.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E8178108970027B232 /* 50x50.png */; };
- FAA484F1178108970027B232 /* 29x29.png in Resources */ = {isa = PBXBuildFile; fileRef = FAA484E9178108970027B232 /* 29x29.png */; };
- FAD3DD4F177221B500B0735B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD3DD4E177221B500B0735B /* UIKit.framework */; };
- FAD3DD51177221B500B0735B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD3DD50177221B500B0735B /* Foundation.framework */; };
- FAD3DD53177221B500B0735B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD3DD52177221B500B0735B /* CoreGraphics.framework */; };
- FAD3DD5B177221B500B0735B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FAD3DD5A177221B500B0735B /* main.m */; };
- FAD3DD5F177221B500B0735B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FAD3DD5E177221B500B0735B /* AppDelegate.m */; };
- FAD3DD61177221B500B0735B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD3DD60177221B500B0735B /* Default.png */; };
- FAD3DD63177221B500B0735B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD3DD62177221B500B0735B /* Default@2x.png */; };
- FAD3DD65177221B500B0735B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD3DD64177221B500B0735B /* Default-568h@2x.png */; };
- FAD3DD68177221B500B0735B /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAD3DD67177221B500B0735B /* MasterViewController.m */; };
- FAD3DD7F1772246600B0735B /* City.m in Sources */ = {isa = PBXBuildFile; fileRef = FAD3DD7E1772246600B0735B /* City.m */; };
- FAD3DD8317724D4A00B0735B /* CityDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FAD3DD8117724D4A00B0735B /* CityDetailViewController.m */; };
- FAD3DD8417724D4A00B0735B /* CityDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FAD3DD8217724D4A00B0735B /* CityDetailViewController.xib */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
- FA1792CC17784F000092B567 /* MapsWithMeAPI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapsWithMeAPI.m; path = ../api/MapsWithMeAPI.m; sourceTree = "<group>"; };
- FA1792CD17784F000092B567 /* MapsWithMeAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapsWithMeAPI.h; path = ../api/MapsWithMeAPI.h; sourceTree = "<group>"; };
- FA776B4D17848A370023F7A0 /* MasterViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MasterViewController.xib; sourceTree = "<group>"; };
- FAA484E2178108970027B232 /* 114x114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 114x114.png; sourceTree = "<group>"; };
- FAA484E3178108970027B232 /* 144x144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 144x144.png; sourceTree = "<group>"; };
- FAA484E4178108970027B232 /* 100x100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 100x100.png; sourceTree = "<group>"; };
- FAA484E5178108970027B232 /* 72x72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 72x72.png; sourceTree = "<group>"; };
- FAA484E6178108970027B232 /* 58x58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 58x58.png; sourceTree = "<group>"; };
- FAA484E7178108970027B232 /* 57x57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 57x57.png; sourceTree = "<group>"; };
- FAA484E8178108970027B232 /* 50x50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 50x50.png; sourceTree = "<group>"; };
- FAA484E9178108970027B232 /* 29x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 29x29.png; sourceTree = "<group>"; };
- FAD3DD4B177221B500B0735B /* Capitals.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Capitals.app; sourceTree = BUILT_PRODUCTS_DIR; };
- FAD3DD4E177221B500B0735B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
- FAD3DD50177221B500B0735B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
- FAD3DD52177221B500B0735B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
- FAD3DD56177221B500B0735B /* Capitals-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Capitals-Info.plist"; sourceTree = "<group>"; };
- FAD3DD5A177221B500B0735B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- FAD3DD5C177221B500B0735B /* Capitals-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Capitals-Prefix.pch"; sourceTree = "<group>"; };
- FAD3DD5D177221B500B0735B /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
- FAD3DD5E177221B500B0735B /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
- FAD3DD60177221B500B0735B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
- FAD3DD62177221B500B0735B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- FAD3DD64177221B500B0735B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
- FAD3DD66177221B500B0735B /* MasterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MasterViewController.h; sourceTree = "<group>"; };
- FAD3DD67177221B500B0735B /* MasterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MasterViewController.m; sourceTree = "<group>"; };
- FAD3DD7D177223BB00B0735B /* City.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = City.h; sourceTree = "<group>"; };
- FAD3DD7E1772246600B0735B /* City.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = City.m; sourceTree = "<group>"; };
- FAD3DD8017724D4A00B0735B /* CityDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CityDetailViewController.h; sourceTree = "<group>"; };
- FAD3DD8117724D4A00B0735B /* CityDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CityDetailViewController.m; sourceTree = "<group>"; };
- FAD3DD8217724D4A00B0735B /* CityDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CityDetailViewController.xib; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- FAD3DD48177221B500B0735B /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FAD3DD4F177221B500B0735B /* UIKit.framework in Frameworks */,
- FAD3DD51177221B500B0735B /* Foundation.framework in Frameworks */,
- FAD3DD53177221B500B0735B /* CoreGraphics.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- FA1792C7177843650092B567 /* MapsWithMe API */ = {
- isa = PBXGroup;
- children = (
- FA1792CD17784F000092B567 /* MapsWithMeAPI.h */,
- FA1792CC17784F000092B567 /* MapsWithMeAPI.m */,
- );
- name = "MapsWithMe API";
- sourceTree = "<group>";
- };
- FAD3DD42177221B500B0735B = {
- isa = PBXGroup;
- children = (
- FA1792C7177843650092B567 /* MapsWithMe API */,
- FAD3DD54177221B500B0735B /* Capitals */,
- FAD3DD4D177221B500B0735B /* Frameworks */,
- FAD3DD4C177221B500B0735B /* Products */,
- );
- sourceTree = "<group>";
- };
- FAD3DD4C177221B500B0735B /* Products */ = {
- isa = PBXGroup;
- children = (
- FAD3DD4B177221B500B0735B /* Capitals.app */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- FAD3DD4D177221B500B0735B /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- FAD3DD4E177221B500B0735B /* UIKit.framework */,
- FAD3DD50177221B500B0735B /* Foundation.framework */,
- FAD3DD52177221B500B0735B /* CoreGraphics.framework */,
- );
- name = Frameworks;
- sourceTree = "<group>";
- };
- FAD3DD54177221B500B0735B /* Capitals */ = {
- isa = PBXGroup;
- children = (
- FAD3DD5D177221B500B0735B /* AppDelegate.h */,
- FAD3DD5E177221B500B0735B /* AppDelegate.m */,
- FAD3DD7D177223BB00B0735B /* City.h */,
- FAD3DD7E1772246600B0735B /* City.m */,
- FAD3DD8017724D4A00B0735B /* CityDetailViewController.h */,
- FAD3DD8117724D4A00B0735B /* CityDetailViewController.m */,
- FAD3DD8217724D4A00B0735B /* CityDetailViewController.xib */,
- FAD3DD66177221B500B0735B /* MasterViewController.h */,
- FAD3DD67177221B500B0735B /* MasterViewController.m */,
- FA776B4D17848A370023F7A0 /* MasterViewController.xib */,
- FAD3DD55177221B500B0735B /* Supporting Files */,
- );
- path = Capitals;
- sourceTree = "<group>";
- };
- FAD3DD55177221B500B0735B /* Supporting Files */ = {
- isa = PBXGroup;
- children = (
- FAA484E2178108970027B232 /* 114x114.png */,
- FAA484E3178108970027B232 /* 144x144.png */,
- FAA484E4178108970027B232 /* 100x100.png */,
- FAA484E5178108970027B232 /* 72x72.png */,
- FAA484E6178108970027B232 /* 58x58.png */,
- FAA484E7178108970027B232 /* 57x57.png */,
- FAA484E8178108970027B232 /* 50x50.png */,
- FAA484E9178108970027B232 /* 29x29.png */,
- FAD3DD56177221B500B0735B /* Capitals-Info.plist */,
- FAD3DD5A177221B500B0735B /* main.m */,
- FAD3DD5C177221B500B0735B /* Capitals-Prefix.pch */,
- FAD3DD60177221B500B0735B /* Default.png */,
- FAD3DD62177221B500B0735B /* Default@2x.png */,
- FAD3DD64177221B500B0735B /* Default-568h@2x.png */,
- );
- name = "Supporting Files";
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- FAD3DD4A177221B500B0735B /* Capitals */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = FAD3DD7A177221B500B0735B /* Build configuration list for PBXNativeTarget "Capitals" */;
- buildPhases = (
- FAD3DD47177221B500B0735B /* Sources */,
- FAD3DD48177221B500B0735B /* Frameworks */,
- FAD3DD49177221B500B0735B /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = Capitals;
- productName = Capitals;
- productReference = FAD3DD4B177221B500B0735B /* Capitals.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- FAD3DD43177221B500B0735B /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 0460;
- ORGANIZATIONNAME = "MapsWithMe GmbH";
- };
- buildConfigurationList = FAD3DD46177221B500B0735B /* Build configuration list for PBXProject "Capitals" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- );
- mainGroup = FAD3DD42177221B500B0735B;
- productRefGroup = FAD3DD4C177221B500B0735B /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- FAD3DD4A177221B500B0735B /* Capitals */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- FAD3DD49177221B500B0735B /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FAD3DD61177221B500B0735B /* Default.png in Resources */,
- FAD3DD63177221B500B0735B /* Default@2x.png in Resources */,
- FAD3DD65177221B500B0735B /* Default-568h@2x.png in Resources */,
- FAD3DD8417724D4A00B0735B /* CityDetailViewController.xib in Resources */,
- FAA484EA178108970027B232 /* 114x114.png in Resources */,
- FAA484EB178108970027B232 /* 144x144.png in Resources */,
- FAA484EC178108970027B232 /* 100x100.png in Resources */,
- FAA484ED178108970027B232 /* 72x72.png in Resources */,
- FAA484EE178108970027B232 /* 58x58.png in Resources */,
- FAA484EF178108970027B232 /* 57x57.png in Resources */,
- FAA484F0178108970027B232 /* 50x50.png in Resources */,
- FAA484F1178108970027B232 /* 29x29.png in Resources */,
- FA776B4F17848A370023F7A0 /* MasterViewController.xib in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- FAD3DD47177221B500B0735B /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FAD3DD5B177221B500B0735B /* main.m in Sources */,
- FAD3DD5F177221B500B0735B /* AppDelegate.m in Sources */,
- FAD3DD68177221B500B0735B /* MasterViewController.m in Sources */,
- FAD3DD7F1772246600B0735B /* City.m in Sources */,
- FAD3DD8317724D4A00B0735B /* CityDetailViewController.m in Sources */,
- FA1792CE17784F000092B567 /* MapsWithMeAPI.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
- FA776B5117848EC50023F7A0 /* Production */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LIBRARY = "libstdc++";
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = "iPhone Distribution";
- COPY_PHASE_STRIP = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- PRODUCT_NAME = "Capitals of the World";
- PROVISIONING_PROFILE = "";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
- VALIDATE_PRODUCT = YES;
- };
- name = Production;
- };
- FA776B5217848EC50023F7A0 /* Production */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Capitals/Capitals-Prefix.pch";
- INFOPLIST_FILE = "Capitals/Capitals-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
- };
- name = Production;
- };
- FAD3DD78177221B500B0735B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LIBRARY = "libstdc++";
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- ONLY_ACTIVE_ARCH = YES;
- PRODUCT_NAME = "Capitals of the World";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
- };
- name = Debug;
- };
- FAD3DD79177221B500B0735B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_CXX_LIBRARY = "libstdc++";
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- COPY_PHASE_STRIP = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- PRODUCT_NAME = "Capitals of the World";
- SDKROOT = iphoneos;
- TARGETED_DEVICE_FAMILY = "1,2";
- VALIDATE_PRODUCT = YES;
- };
- name = Release;
- };
- FAD3DD7B177221B500B0735B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Capitals/Capitals-Prefix.pch";
- INFOPLIST_FILE = "Capitals/Capitals-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
- };
- name = Debug;
- };
- FAD3DD7C177221B500B0735B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "Capitals/Capitals-Prefix.pch";
- INFOPLIST_FILE = "Capitals/Capitals-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- PRODUCT_NAME = "$(TARGET_NAME)";
- WRAPPER_EXTENSION = app;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- FAD3DD46177221B500B0735B /* Build configuration list for PBXProject "Capitals" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- FAD3DD78177221B500B0735B /* Debug */,
- FAD3DD79177221B500B0735B /* Release */,
- FA776B5117848EC50023F7A0 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- FAD3DD7A177221B500B0735B /* Build configuration list for PBXNativeTarget "Capitals" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- FAD3DD7B177221B500B0735B /* Debug */,
- FAD3DD7C177221B500B0735B /* Release */,
- FA776B5217848EC50023F7A0 /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = FAD3DD43177221B500B0735B /* Project object */;
-}
diff --git a/api/iOS/capitals-example/Capitals.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/api/iOS/capitals-example/Capitals.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 0be6b61bf0..0000000000
--- a/api/iOS/capitals-example/Capitals.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
- version = "1.0">
- <FileRef
- location = "self:Capitals.xcodeproj">
- </FileRef>
-</Workspace>
diff --git a/api/iOS/capitals-example/Capitals/100x100.png b/api/iOS/capitals-example/Capitals/100x100.png
deleted file mode 100644
index dd5b0acd0d..0000000000
--- a/api/iOS/capitals-example/Capitals/100x100.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/114x114.png b/api/iOS/capitals-example/Capitals/114x114.png
deleted file mode 100644
index 73558ad760..0000000000
--- a/api/iOS/capitals-example/Capitals/114x114.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/144x144.png b/api/iOS/capitals-example/Capitals/144x144.png
deleted file mode 100644
index 00b29ef4fa..0000000000
--- a/api/iOS/capitals-example/Capitals/144x144.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/29x29.png b/api/iOS/capitals-example/Capitals/29x29.png
deleted file mode 100644
index cbb50faf95..0000000000
--- a/api/iOS/capitals-example/Capitals/29x29.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/50x50.png b/api/iOS/capitals-example/Capitals/50x50.png
deleted file mode 100644
index 9b713a38c6..0000000000
--- a/api/iOS/capitals-example/Capitals/50x50.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/57x57.png b/api/iOS/capitals-example/Capitals/57x57.png
deleted file mode 100644
index 96c780b4bc..0000000000
--- a/api/iOS/capitals-example/Capitals/57x57.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/58x58.png b/api/iOS/capitals-example/Capitals/58x58.png
deleted file mode 100644
index b8fa5afb49..0000000000
--- a/api/iOS/capitals-example/Capitals/58x58.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/72x72.png b/api/iOS/capitals-example/Capitals/72x72.png
deleted file mode 100644
index 12496a7f93..0000000000
--- a/api/iOS/capitals-example/Capitals/72x72.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/AppDelegate.h b/api/iOS/capitals-example/Capitals/AppDelegate.h
deleted file mode 100644
index 883be087aa..0000000000
--- a/api/iOS/capitals-example/Capitals/AppDelegate.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow * window;
-
-@property (strong, nonatomic) UINavigationController * navigationController;
-
-@property (strong, nonatomic) UISplitViewController * splitViewController;
-
-@end
diff --git a/api/iOS/capitals-example/Capitals/AppDelegate.m b/api/iOS/capitals-example/Capitals/AppDelegate.m
deleted file mode 100644
index ea59875de3..0000000000
--- a/api/iOS/capitals-example/Capitals/AppDelegate.m
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import "AppDelegate.h"
-#import "MasterViewController.h"
-#import "CityDetailViewController.h"
-
-#import "MapsWithMeAPI.h"
-
-@implementation AppDelegate
-
-// MapsWithMe API entry point, when user comes back to your app
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
-{
- if ([MWMApi isMapsWithMeUrl:url])
- {
- // if we got nil, it means that Back button was pressed without selecting any pin
- MWMPin * pin = [MWMApi pinFromUrl:url];
- if (pin)
- {
- size_t const cityId = [pin.idOrUrl integerValue];
- // display selected page based on passed id
- if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone)
- {
- [self.navigationController popToRootViewControllerAnimated:NO];
- MasterViewController * masterVC = [self.navigationController.viewControllers objectAtIndex:0];
- if (!masterVC.detailViewController)
- masterVC.detailViewController = [[[CityDetailViewController alloc] initWithNibName:@"CityDetailViewController" bundle:nil] autorelease];
- masterVC.detailViewController.cityIndex = cityId;
- [masterVC.navigationController pushViewController:masterVC.detailViewController animated:YES];
- }
- else
- {
- CityDetailViewController * detailVC = (CityDetailViewController *)self.splitViewController.delegate;
- detailVC.cityIndex = cityId;
- }
- }
- return YES;
- }
- return NO;
-}
-
-- (void)dealloc
-{
- self.window = nil;
- self.navigationController = nil;
- self.splitViewController = nil;
- [super dealloc];
-}
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
- self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
-
- if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone)
- {
- MasterViewController * masterViewController = [[[MasterViewController alloc] initWithNibName:@"MasterViewController" bundle:nil] autorelease];
- self.navigationController = [[[UINavigationController alloc] initWithRootViewController:masterViewController] autorelease];
- self.window.rootViewController = self.navigationController;
- }
- else
- {
- MasterViewController * masterViewController = [[[MasterViewController alloc] initWithNibName:@"MasterViewController" bundle:nil] autorelease];
- UINavigationController * masterNavigationController = [[[UINavigationController alloc] initWithRootViewController:masterViewController] autorelease];
-
- CityDetailViewController * detailViewController = [[[CityDetailViewController alloc] initWithNibName:@"CityDetailViewController" bundle:nil] autorelease];
- UINavigationController * detailNavigationController = [[[UINavigationController alloc] initWithRootViewController:detailViewController] autorelease];
-
- masterViewController.detailViewController = detailViewController;
-
- self.splitViewController = [[[UISplitViewController alloc] init] autorelease];
- self.splitViewController.delegate = detailViewController;
- self.splitViewController.viewControllers = @[masterNavigationController, detailNavigationController];
-
- self.window.rootViewController = self.splitViewController;
- }
-
- [self.window makeKeyAndVisible];
- return YES;
-}
-
-@end
diff --git a/api/iOS/capitals-example/Capitals/Capitals-Info.plist b/api/iOS/capitals-example/Capitals/Capitals-Info.plist
deleted file mode 100644
index 38ff6711c7..0000000000
--- a/api/iOS/capitals-example/Capitals/Capitals-Info.plist
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDisplayName</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIconFiles</key>
- <array>
- <string>114x114.png</string>
- <string>144x144.png</string>
- <string>100x100.png</string>
- <string>72x72.png</string>
- <string>58x58.png</string>
- <string>57x57.png</string>
- <string>50x50.png</string>
- <string>29x29.png</string>
- </array>
- <key>CFBundleIdentifier</key>
- <string>com.mapswithme.api.example.${PRODUCT_NAME:rfc1034identifier}</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleURLTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeRole</key>
- <string>Viewer</string>
- <key>CFBundleURLName</key>
- <string>com.mapswithme.maps</string>
- <key>CFBundleURLSchemes</key>
- <array>
- <string>MapsWithMeApiExampleCapitals</string>
- </array>
- </dict>
- </array>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>UIPrerenderedIcon</key>
- <true/>
- <key>UIRequiredDeviceCapabilities</key>
- <array>
- <string>armv7</string>
- </array>
- <key>UIStatusBarTintParameters</key>
- <dict>
- <key>UINavigationBar</key>
- <dict>
- <key>Style</key>
- <string>UIBarStyleDefault</string>
- <key>Translucent</key>
- <false/>
- </dict>
- </dict>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- <string>UIInterfaceOrientationPortraitUpsideDown</string>
- </array>
- <key>UISupportedInterfaceOrientations~ipad</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- <string>UIInterfaceOrientationPortraitUpsideDown</string>
- <string>UIInterfaceOrientationLandscapeLeft</string>
- <string>UIInterfaceOrientationLandscapeRight</string>
- </array>
-</dict>
-</plist>
diff --git a/api/iOS/capitals-example/Capitals/Capitals-Prefix.pch b/api/iOS/capitals-example/Capitals/Capitals-Prefix.pch
deleted file mode 100644
index f497d6b2e1..0000000000
--- a/api/iOS/capitals-example/Capitals/Capitals-Prefix.pch
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import <Availability.h>
-
-#ifndef __IPHONE_4_3
-#warning "This project uses features only available in iOS SDK 4.3 and later."
-#endif
-
-#ifdef __OBJC__
- #import <UIKit/UIKit.h>
- #import <Foundation/Foundation.h>
-#endif
diff --git a/api/iOS/capitals-example/Capitals/City.h b/api/iOS/capitals-example/Capitals/City.h
deleted file mode 100644
index e439345890..0000000000
--- a/api/iOS/capitals-example/Capitals/City.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-@class NSString;
-
-typedef struct
-{
- NSString * name;
- double lat;
- double lon;
- NSString * countryCode;
- int population;
- NSString * timeZone;
-} City;
-
-extern City const CAPITALS[241]; \ No newline at end of file
diff --git a/api/iOS/capitals-example/Capitals/City.m b/api/iOS/capitals-example/Capitals/City.m
deleted file mode 100644
index 53a625e369..0000000000
--- a/api/iOS/capitals-example/Capitals/City.m
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#include "City.h"
-
- City const CAPITALS[241] = {{@"Abu Dhabi", 24.46667, 54.36667, @"AE", 603492, @"Asia/Dubai"},
- {@"Abuja", 9.06853, 7.48375, @"NG", 590400, @"Africa/Lagos"},
- {@"Accra", 5.55602, -0.1969, @"GH", 1963264, @"Africa/Accra"},
- {@"Adamstown", -25.06597, -130.1015, @"PN", 46, @"Pacific/Pitcairn"},
- {@"Addis Ababa", 9.02497, 38.74689, @"ET", 2757729, @"Africa/Addis_Ababa"},
- {@"Algiers", 36.7525, 3.04197, @"DZ", 1977663, @"Africa/Algiers"},
- {@"Alofi", -19.05952, -169.9187, @"NU", 624, @"Pacific/Niue"},
- {@"Amman", 31.95522, 35.94503, @"JO", 1275857, @"Asia/Amman"},
- {@"Amsterdam", 52.37403, 4.88969, @"NL", 741636, @"Europe/Amsterdam"},
- {@"Andorra la Vella", 42.50779, 1.52109, @"AD", 20430, @"Europe/Andorra"},
- {@"Ankara", 39.91987, 32.85427, @"TR", 3517182, @"Europe/Istanbul"},
- {@"Antananarivo", -18.91368, 47.53613, @"MG", 1391433, @"Indian/Antananarivo"},
- {@"Apia", -13.83333, -171.7667, @"WS", 40407, @"Pacific/Apia"},
- {@"Ashgabat", 37.95, 58.38333, @"TM", 727700, @"Asia/Ashgabat"},
- {@"Asmara", 15.33805, 38.93184, @"ER", 563930, @"Africa/Asmara"},
- {@"Astana", 51.1801, 71.44598, @"KZ", 345604, @"Asia/Almaty"},
- {@"Asunción", -25.30066, -57.63591, @"PY", 1482200, @"America/Asuncion"},
- {@"Athens", 37.97945, 23.71622, @"GR", 729137, @"Europe/Athens"},
- {@"Avarua", -21.20778, -159.775, @"CK", 13373, @"Pacific/Rarotonga"},
- {@"Baghdad", 33.34058, 44.40088, @"IQ", 5672513, @"Asia/Baghdad"},
- {@"Baku", 40.37767, 49.89201, @"AZ", 1116513, @"Asia/Baku"},
- {@"Bamako", 12.65, -8, @"ML", 1297281, @"Africa/Bamako"},
- {@"Bandar Seri Begawan", 4.94029, 114.9481, @"BN", 64409, @"Asia/Brunei"},
- {@"Bangkok", 13.75398, 100.5014, @"TH", 5104476, @"Asia/Bangkok"},
- {@"Bangui", 4.36122, 18.55496, @"CF", 542393, @"Africa/Bangui"},
- {@"Banjul", 13.45274, -16.57803, @"GM", 34589, @"Africa/Banjul"},
- {@"Basse-Terre", 15.99854, -61.72548, @"GP", 11472, @"America/Guadeloupe"},
- {@"Basseterre", 17.29484, -62.7261, @"KN", 12920, @"America/St_Kitts"},
- {@"Beijing", 39.9075, 116.3972, @"CN", 7480601, @"Asia/Shanghai"},
- {@"Beirut", 33.88894, 35.49442, @"LB", 1916100, @"Asia/Beirut"},
- {@"Belgrade", 44.80401, 20.46513, @"RS", 1273651, @"Europe/Belgrade"},
- {@"Belmopan", 17.25, -88.76667, @"BZ", 13381, @"America/Belize"},
- {@"Berlin", 52.52437, 13.41053, @"DE", 3426354, @"Europe/Berlin"},
- {@"Bern", 46.94809, 7.44744, @"CH", 121631, @"Europe/Zurich"},
- {@"Bishkek", 42.87, 74.59, @"KG", 900000, @"Asia/Bishkek"},
- {@"Bissau", 11.86357, -15.59767, @"GW", 388028, @"Africa/Bissau"},
- {@"Bogotá", 4.60971, -74.08175, @"CO", 7102602, @"America/Bogota"},
- {@"Brasília", -15.77972, -47.92972, @"BR", 2207718, @"America/Sao_Paulo"},
- {@"Bratislava", 48.14816, 17.10674, @"SK", 423737, @"Europe/Bratislava"},
- {@"Brazzaville", -4.26613, 15.28318, @"CG", 1284609, @"Africa/Brazzaville"},
- {@"Bridgetown", 13.1, -59.61667, @"BB", 98511, @"America/Barbados"},
- {@"Brussels", 50.85045, 4.34878, @"BE", 1019022, @"Europe/Brussels"},
- {@"Bucharest", 44.43225, 26.10626, @"RO", 1877155, @"Europe/Bucharest"},
- {@"Budapest", 47.49801, 19.03991, @"HU", 1696128, @"Europe/Budapest"},
- {@"Buenos Aires", -34.61315, -58.37723, @"AR", 13076300, @"America/Argentina/Buenos_Aires"},
- {@"Bujumbura", -3.3822, 29.3644, @"BI", 331700, @"Africa/Bujumbura"},
- {@"Cairo", 30.06263, 31.24967, @"EG", 7734614, @"Africa/Cairo"},
- {@"Canberra", -35.28346, 149.1281, @"AU", 327700, @"Australia/Sydney"},
- {@"Caracas", 10.48801, -66.87919, @"VE", 3000000, @"America/Caracas"},
- {@"Castries", 13.9957, -61.00614, @"LC", 10000, @"America/St_Lucia"},
- {@"Cayenne", 4.93333, -52.33333, @"GF", 61550, @"America/Cayenne"},
- {@"Charlotte Amalie", 18.3419, -64.9307, @"VI", 20000, @"America/St_Thomas"},
- {@"Chişinău", 47.00556, 28.8575, @"MD", 635994, @"Europe/Chisinau"},
- {@"Cockburn Town", 21.46122, -71.14188, @"TC", 3720, @"America/Grand_Turk"},
- {@"Colombo", 6.93194, 79.84778, @"LK", 648034, @"Asia/Colombo"},
- {@"Conakry", 9.53795, -13.67729, @"GN", 1767200, @"Africa/Conakry"},
- {@"Copenhagen", 55.67594, 12.56553, @"DK", 1153615, @"Europe/Copenhagen"},
- {@"Dakar", 14.6937, -17.44406, @"SN", 2476400, @"Africa/Dakar"},
- {@"Damascus", 33.5102, 36.29128, @"SY", 1569394, @"Asia/Damascus"},
- {@"Dhaka", 23.7104, 90.40744, @"BD", 10356500, @"Asia/Dhaka"},
- {@"Dili", -8.55861, 125.5736, @"TL", 150000, @"Asia/Dili"},
- {@"Djibouti", 11.58901, 43.14503, @"DJ", 623891, @"Africa/Djibouti"},
- {@"Dodoma", -6.17221, 35.73947, @"TZ", 180541, @"Africa/Dar_es_Salaam"},
- {@"Doha", 25.27932, 51.52245, @"QA", 344939, @"Asia/Qatar"},
- {@"Douglas", 54.15, -4.48333, @"IM", 26218, @"Europe/Isle_of_Man"},
- {@"Dublin", 53.33306, -6.24889, @"IE", 1024027, @"Europe/Dublin"},
- {@"Dushanbe", 38.53575, 68.77905, @"TJ", 543107, @"Asia/Dushanbe"},
- {@"Flying Fish Cove", -10.42172, 105.6791, @"CX", 500, @"Indian/Christmas"},
- {@"Fort-de-France", 14.60892, -61.07334, @"MQ", 89995, @"America/Martinique"},
- {@"Freetown", 8.484, -13.22994, @"SL", 802639, @"Africa/Freetown"},
- {@"Funafuti", -8.52425, 179.1942, @"TV", 4492, @"Pacific/Funafuti"},
- {@"Gaborone", -24.65451, 25.90859, @"BW", 208411, @"Africa/Gaborone"},
- {@"George Town", 19.28692, -81.36706, @"KY", 29370, @"America/Cayman"},
- {@"Georgetown", 6.80448, -58.15527, @"GY", 235017, @"America/Guyana"},
- {@"Gibraltar", 36.14474, -5.35257, @"GI", 26544, @"Europe/Gibraltar"},
- {@"Grytviken", -54.28111, -36.5092, @"GS", 2, @"Atlantic/South_Georgia"},
- {@"Guatemala City", 14.64072, -90.51327, @"GT", 994938, @"America/Guatemala"},
- {@"Gustavia", 17.89618, -62.84978, @"BL", 5988, @"America/St_Barthelemy"},
- {@"Hagåtña", 13.47567, 144.7489, @"GU", 1051, @"Pacific/Guam"},
- {@"Hamilton", 32.29149, -64.77797, @"BM", 902, @"Atlantic/Bermuda"},
- {@"Harare", -17.82772, 31.05337, @"ZW", 1542813, @"Africa/Harare"},
- {@"Havana", 23.13302, -82.38304, @"CU", 2163824, @"America/Havana"},
- {@"Helsinki", 60.16952, 24.93545, @"FI", 558457, @"Europe/Helsinki"},
- {@"Hong Kong", 22.28552, 114.1577, @"HK", 7012738, @"Asia/Hong_Kong"},
- {@"Honiara", -9.43333, 159.95, @"SB", 56298, @"Pacific/Guadalcanal"},
- {@"Hà Nội", 21.0245, 105.8412, @"VN", 1431270, @"Asia/Ho_Chi_Minh"},
- {@"Islamabad", 33.72148, 73.04329, @"PK", 601600, @"Asia/Karachi"},
- {@"Jakarta", -6.21462, 106.8451, @"ID", 8540121, @"Asia/Jakarta"},
- {@"Jamestown", -15.93872, -5.71675, @"SH", 637, @"Atlantic/St_Helena"},
- {@"Juba", 4.85165, 31.58247, @"SS", 300000, @"Africa/Juba"},
- {@"Kabul", 34.52813, 69.17233, @"AF", 3043532, @"Asia/Kabul"},
- {@"Kampala", 0.31628, 32.58219, @"UG", 1353189, @"Africa/Kampala"},
- {@"Kathmandu", 27.70169, 85.3206, @"NP", 1442271, @"Asia/Kathmandu"},
- {@"Khartoum", 15.55177, 32.53241, @"SD", 1974647, @"Africa/Khartoum"},
- {@"Kiev", 50.45466, 30.5238, @"UA", 2514227, @"Europe/Kiev"},
- {@"Kigali", -1.94995, 30.05885, @"RW", 745261, @"Africa/Kigali"},
- {@"Kingston", -29.05459, 167.9663, @"NF", 880, @"Pacific/Norfolk"},
- {@"Kingston", 17.99702, -76.79358, @"JM", 937700, @"America/Jamaica"},
- {@"Kingstown", 13.15872, -61.22475, @"VC", 24518, @"America/St_Vincent"},
- {@"Kinshasa", -4.32142, 15.30807, @"CD", 7785965, @"Africa/Kinshasa"},
- {@"Kralendijk", 12.15, -68.26667, @"BQ", 3081, @"America/Kralendijk"},
- {@"Kuala Lumpur", 3.1412, 101.6865, @"MY", 1453975, @"Asia/Kuala_Lumpur"},
- {@"Kuwait City", 29.36972, 47.97833, @"KW", 60064, @"Asia/Kuwait"},
- {@"El Aaiún", 27.16224, -13.20315, @"EH", 188084, @"Africa/El_Aaiun"},
- {@"Libreville", 0.39241, 9.45356, @"GA", 578156, @"Africa/Libreville"},
- {@"Lilongwe", -13.96692, 33.78725, @"MW", 646750, @"Africa/Blantyre"},
- {@"Lima", -12.04318, -77.02824, @"PE", 7737002, @"America/Lima"},
- {@"Lisbon", 38.71667, -9.13333, @"PT", 517802, @"Europe/Lisbon"},
- {@"Ljubljana", 46.05108, 14.50513, @"SI", 255115, @"Europe/Ljubljana"},
- {@"Lomé", 6.13748, 1.21227, @"TG", 749700, @"Africa/Lome"},
- {@"London", 51.50853, -0.12574, @"GB", 7556900, @"Europe/London"},
- {@"Longyearbyen", 78.2186, 15.64007, @"SJ", 2060, @"Arctic/Longyearbyen"},
- {@"Luanda", -8.83682, 13.23432, @"AO", 2776168, @"Africa/Luanda"},
- {@"Lusaka", -15.40669, 28.28713, @"ZM", 1267440, @"Africa/Lusaka"},
- {@"Luxembourg", 49.61167, 6.13, @"LU", 76684, @"Europe/Luxembourg"},
- {@"Macau", 22.20056, 113.5461, @"MO", 520400, @"Asia/Macau"},
- {@"Madrid", 40.4165, -3.70256, @"ES", 3255944, @"Europe/Madrid"},
- {@"Majuro", 7.08971, 171.3803, @"MH", 25400, @"Pacific/Majuro"},
- {@"Malabo", 3.75, 8.78333, @"GQ", 155963, @"Africa/Malabo"},
- {@"Male", 4.1748, 73.50888, @"MV", 103693, @"Indian/Maldives"},
- {@"Mamoudzou", -12.77944, 45.22722, @"YT", 54831, @"Indian/Mayotte"},
- {@"Managua", 12.13282, -86.2504, @"NI", 973087, @"America/Managua"},
- {@"Manama", 26.21536, 50.5832, @"BH", 147074, @"Asia/Bahrain"},
- {@"Manila", 14.6042, 120.9822, @"PH", 10444527, @"Asia/Manila"},
- {@"Maputo", -25.96553, 32.58322, @"MZ", 1191613, @"Africa/Maputo"},
- {@"Mariehamn", 60.09726, 19.93481, @"AX", 10682, @"Europe/Mariehamn"},
- {@"Marigot", 18.06667, -63.08333, @"MF", 5700, @"America/Marigot"},
- {@"Maseru", -29.31667, 27.48333, @"LS", 118355, @"Africa/Maseru"},
- {@"Mata-Utu", -13.28163, -176.1745, @"WF", 1200, @"Pacific/Wallis"},
- {@"Mbabane", -26.31667, 31.13333, @"SZ", 76218, @"Africa/Mbabane"},
- {@"Melekeok", 7.50043, 134.6235, @"PW", 0, @"Pacific/Palau"},
- {@"Mexico City", 19.42847, -99.12766, @"MX", 12294193, @"America/Mexico_City"},
- {@"Minsk", 53.9, 27.56667, @"BY", 1742124, @"Europe/Minsk"},
- {@"Mogadishu", 2.03711, 45.34375, @"SO", 2587183, @"Africa/Mogadishu"},
- {@"Monaco", 43.73333, 7.41667, @"MC", 32965, @"Europe/Monaco"},
- {@"Monrovia", 6.30054, -10.7969, @"LR", 939524, @"Africa/Monrovia"},
- {@"Montevideo", -34.83346, -56.16735, @"UY", 1270737, @"America/Montevideo"},
- {@"Moroni", -11.70216, 43.25506, @"KM", 42872, @"Indian/Comoro"},
- {@"Moscow", 55.75222, 37.61556, @"RU", 10381222, @"Europe/Moscow"},
- {@"Muscat", 23.61387, 58.5922, @"OM", 797000, @"Asia/Muscat"},
- {@"N'Djamena", 12.10672, 15.0444, @"TD", 721081, @"Africa/Ndjamena"},
- {@"Nairobi", -1.28333, 36.81667, @"KE", 2750547, @"Africa/Nairobi"},
- {@"Nassau", 25.05823, -77.34306, @"BS", 227940, @"America/Nassau"},
- {@"Nay Pyi Taw", 19.745, 96.12972, @"MM", 925000, @"Asia/Rangoon"},
- {@"New Delhi", 28.63576, 77.22445, @"IN", 317797, @"Asia/Kolkata"},
- {@"Niamey", 13.51366, 2.1098, @"NE", 774235, @"Africa/Niamey"},
- {@"Nicosia", 35.16667, 33.36667, @"CY", 200452, @"Asia/Nicosia"},
- {@"Nouakchott", 18.08581, -15.9785, @"MR", 661400, @"Africa/Nouakchott"},
- {@"Nouméa", -22.27631, 166.4572, @"NC", 93060, @"Pacific/Noumea"},
- {@"Nuku‘alofa", -21.13938, -175.2018, @"TO", 22400, @"Pacific/Tongatapu"},
- {@"Nuuk", 64.18347, -51.72157, @"GL", 14798, @"America/Godthab"},
- {@"Oranjestad", 12.52398, -70.02703, @"AW", 29998, @"America/Aruba"},
- {@"Oslo", 59.91273, 10.74609, @"NO", 580000, @"Europe/Oslo"},
- {@"Ottawa", 45.41117, -75.69812, @"CA", 812129, @"America/Toronto"},
- {@"Ouagadougou", 12.36566, -1.53388, @"BF", 1086505, @"Africa/Ouagadougou"},
- {@"Pago Pago", -14.27806, -170.7025, @"AS", 11500, @"Pacific/Pago_Pago"},
- {@"Palikir - National Government Center", 6.92477, 158.1611, @"FM", 0, @"Pacific/Pohnpei"},
- {@"Panamá", 8.9936, -79.51973, @"PA", 408168, @"America/Panama"},
- {@"Papeete", -17.53333, -149.5667, @"PF", 26357, @"Pacific/Tahiti"},
- {@"Paramaribo", 5.86638, -55.16682, @"SR", 223757, @"America/Paramaribo"},
- {@"Paris", 48.85341, 2.3488, @"FR", 2138551, @"Europe/Paris"},
- {@"Philipsburg", 18.026, -63.04582, @"SX", 1400, @"America/Lower_Princes"},
- {@"Phnom Penh", 11.56245, 104.916, @"KH", 1573544, @"Asia/Phnom_Penh"},
- {@"Plymouth", 16.70555, -62.21292, @"MS", 0, @"America/Montserrat"},
- {@"Podgorica", 42.44111, 19.26361, @"ME", 136473, @"Europe/Podgorica"},
- {@"Port Louis", -20.16194, 57.49889, @"MU", 155226, @"Indian/Mauritius"},
- {@"Port Moresby", -9.44314, 147.1797, @"PG", 283733, @"Pacific/Port_Moresby"},
- {@"Port-Vila", -17.73381, 168.3219, @"VU", 35901, @"Pacific/Efate"},
- {@"Port-au-Prince", 18.53917, -72.335, @"HT", 1234742, @"America/Port-au-Prince"},
- {@"Port-aux-Français", -49.35, 70.21667, @"TF", 45, @"Indian/Kerguelen"},
- {@"Port-of-Spain", 10.66617, -61.51657, @"TT", 49031, @"America/Port_of_Spain"},
- {@"Porto-Novo", 6.49646, 2.60359, @"BJ", 234168, @"Africa/Porto-Novo"},
- {@"Prague", 50.08804, 14.42076, @"CZ", 1165581, @"Europe/Prague"},
- {@"Praia", 14.93152, -23.51254, @"CV", 113364, @"Atlantic/Cape_Verde"},
- {@"Pretoria", -25.74486, 28.18783, @"ZA", 1619438, @"Africa/Johannesburg"},
- {@"Pristina", 42.67272, 21.16688, @"XK", 550000, @"Europe/Belgrade"},
- {@"Pyongyang", 39.03385, 125.7543, @"KP", 3222000, @"Asia/Pyongyang"},
- {@"Quito", -0.22985, -78.52495, @"EC", 1399814, @"America/Guayaquil"},
- {@"Rabat", 34.01325, -6.83255, @"MA", 1655753, @"Africa/Casablanca"},
- {@"Reykjavík", 64.13548, -21.89541, @"IS", 113906, @"Atlantic/Reykjavik"},
- {@"Riga", 56.946, 24.10589, @"LV", 742572, @"Europe/Riga"},
- {@"Riyadh", 24.68773, 46.72185, @"SA", 4205961, @"Asia/Riyadh"},
- {@"Road Town", 18.41667, -64.61667, @"VG", 8449, @"America/Tortola"},
- {@"Rome", 41.89474, 12.4839, @"IT", 2563241, @"Europe/Rome"},
- {@"Roseau", 15.30174, -61.38808, @"DM", 16571, @"America/Dominica"},
- {@"Saint George's", 12.05644, -61.74849, @"GD", 7500, @"America/Grenada"},
- {@"Saint Helier", 49.18804, -2.10491, @"JE", 28000, @"Europe/Jersey"},
- {@"Saint John’s", 17.11667, -61.85, @"AG", 24226, @"America/Antigua"},
- {@"Saint Peter Port", 49.45981, -2.53527, @"GG", 16488, @"Europe/Guernsey"},
- {@"Saint-Denis", -20.88231, 55.4504, @"RE", 137195, @"Indian/Reunion"},
- {@"Saint-Pierre", 46.78091, -56.17196, @"PM", 6200, @"America/Miquelon"},
- {@"Saipan", 15.21233, 145.7545, @"MP", 48220, @"Pacific/Saipan"},
- {@"San José", 9.93333, -84.08333, @"CR", 335007, @"America/Costa_Rica"},
- {@"San Juan", 18.46633, -66.10572, @"PR", 418140, @"America/Puerto_Rico"},
- {@"San Marino", 43.93667, 12.44639, @"SM", 4500, @"Europe/San_Marino"},
- {@"San Salvador", 13.68935, -89.18718, @"SV", 525990, @"America/El_Salvador"},
- {@"Sanaa", 15.35472, 44.20667, @"YE", 1937451, @"Asia/Aden"},
- {@"Santiago", -33.45694, -70.64827, @"CL", 4837295, @"America/Santiago"},
- {@"Santo Domingo", 18.50012, -69.98857, @"DO", 2201941, @"America/Santo_Domingo"},
- {@"Sarajevo", 43.84864, 18.35644, @"BA", 696731, @"Europe/Sarajevo"},
- {@"Seoul", 37.56826, 126.9778, @"KR", 10349312, @"Asia/Seoul"},
- {@"Singapore", 1.28967, 103.8501, @"SG", 3547809, @"Asia/Singapore"},
- {@"Skopje", 42.00122, 21.42878, @"MK", 474889, @"Europe/Skopje"},
- {@"Sofia", 42.69751, 23.32415, @"BG", 1152556, @"Europe/Sofia"},
- {@"Stanley", -51.7, -57.85, @"FK", 2213, @"Atlantic/Stanley"},
- {@"Stockholm", 59.33258, 18.0649, @"SE", 1253309, @"Europe/Stockholm"},
- {@"Sucre", -19.03332, -65.26274, @"BO", 224838, @"America/La_Paz"},
- {@"Suva", -18.14161, 178.4415, @"FJ", 77366, @"Pacific/Fiji"},
- {@"São Tomé", 0.33654, 6.72732, @"ST", 53300, @"Africa/Sao_Tome"},
- {@"Taipei", 25.04776, 121.5319, @"TW", 7871900, @"Asia/Taipei"},
- {@"Tallinn", 59.43696, 24.75353, @"EE", 394024, @"Europe/Tallinn"},
- {@"Tarawa", 1.3278, 172.977, @"KI", 40311, @"Pacific/Tarawa"},
- {@"Tashkent", 41.26465, 69.21627, @"UZ", 1978028, @"Asia/Tashkent"},
- {@"Tbilisi", 41.69411, 44.83368, @"GE", 1049498, @"Asia/Tbilisi"},
- {@"Tegucigalpa", 14.0818, -87.20681, @"HN", 850848, @"America/Tegucigalpa"},
- {@"Tehrān", 35.69439, 51.42151, @"IR", 7153309, @"Asia/Tehran"},
- {@"The Valley", 18.21704, -63.05783, @"AI", 2035, @"America/Anguilla"},
- {@"Thimphu", 27.46609, 89.64191, @"BT", 98676, @"Asia/Thimphu"},
- {@"Tirana", 41.3275, 19.81889, @"AL", 374801, @"Europe/Tirane"},
- {@"Tokyo", 35.6895, 139.6917, @"JP", 8336599, @"Asia/Tokyo"},
- {@"Tripoli", 32.87519, 13.18746, @"LY", 1150989, @"Africa/Tripoli"},
- {@"Tunis", 36.81897, 10.16579, @"TN", 693210, @"Africa/Tunis"},
- {@"Tórshavn", 62.00973, -6.77164, @"FO", 13200, @"Atlantic/Faroe"},
- {@"Ulaanbaatar", 47.90771, 106.8832, @"MN", 844818, @"Asia/Ulaanbaatar"},
- {@"Vaduz", 47.14151, 9.52154, @"LI", 5197, @"Europe/Vaduz"},
- {@"Valletta", 35.89972, 14.51472, @"MT", 6794, @"Europe/Malta"},
- {@"Vatican City", 41.90236, 12.45332, @"VA", 829, @"Europe/Vatican"},
- {@"Victoria", -4.61667, 55.45, @"SC", 22881, @"Indian/Mahe"},
- {@"Vienna", 48.20849, 16.37208, @"AT", 1691468, @"Europe/Vienna"},
- {@"Vientiane", 17.96667, 102.6, @"LA", 196731, @"Asia/Vientiane"},
- {@"Vilnius", 54.68916, 25.2798, @"LT", 542366, @"Europe/Vilnius"},
- {@"Warsaw", 52.22977, 21.01178, @"PL", 1702139, @"Europe/Warsaw"},
- {@"Washington, D. C.", 38.89511, -77.03637, @"US", 601723, @"America/New_York"},
- {@"Wellington", -41.28664, 174.7756, @"NZ", 381900, @"Pacific/Auckland"},
- {@"West Island", -12.15681, 96.82251, @"CC", 120, @"Indian/Cocos"},
- {@"Willemstad", 12.1084, -68.93354, @"CW", 125000, @"America/Curacao"},
- {@"Windhoek", -22.55941, 17.08323, @"NA", 268132, @"Africa/Windhoek"},
- {@"Yamoussoukro", 6.82055, -5.27674, @"CI", 194530, @"Africa/Abidjan"},
- {@"Yaoundé", 3.86667, 11.51667, @"CM", 1299369, @"Africa/Douala"},
- {@"Yerevan", 40.18111, 44.51361, @"AM", 1093485, @"Asia/Yerevan"},
- {@"Zagreb", 45.81444, 15.97798, @"HR", 698966, @"Europe/Zagreb"}
- };
diff --git a/api/iOS/capitals-example/Capitals/CityDetailViewController.h b/api/iOS/capitals-example/Capitals/CityDetailViewController.h
deleted file mode 100644
index 5481b1b22e..0000000000
--- a/api/iOS/capitals-example/Capitals/CityDetailViewController.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-@interface CityDetailViewController : UITableViewController <UISplitViewControllerDelegate>
-
-@property (nonatomic, assign) size_t cityIndex;
-
-@end
diff --git a/api/iOS/capitals-example/Capitals/CityDetailViewController.m b/api/iOS/capitals-example/Capitals/CityDetailViewController.m
deleted file mode 100644
index 48086c06f8..0000000000
--- a/api/iOS/capitals-example/Capitals/CityDetailViewController.m
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import "CityDetailViewController.h"
-#import "City.h"
-
-#import "MapsWithMeAPI.h"
-
-@interface CityDetailViewController ()
-@property (strong, nonatomic) UIPopoverController * masterPopoverController;
-- (void)configureView;
-@end
-
-
-@implementation CityDetailViewController
-
-- (NSString *)urlEncode:(NSString *)str
-{
- return [(NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)str, NULL, CFSTR("!$&'()*+,-./:;=?@_~"), kCFStringEncodingUTF8) autorelease];
-}
-
-- (void)showCapitalOnTheMap:(BOOL)withLink
-{
- City const * city = &CAPITALS[_cityIndex];
- NSString * pinId;
- if (withLink)
- pinId = [NSString stringWithFormat:@"http://en.wikipedia.org/wiki/%@", [self urlEncode:city->name]];
- else
- pinId = [NSString stringWithFormat:@"%ld", _cityIndex];
- [MWMApi showLat:city->lat lon:city->lon title:city->name and:pinId];
-}
-
-- (void)dealloc
-{
- self.masterPopoverController = nil;
- [super dealloc];
-}
-
-- (void)setCityIndex:(size_t)newCityIndex
-{
- if (_cityIndex != newCityIndex)
- {
- _cityIndex = newCityIndex;
- // Update the view.
- [self configureView];
- }
-
- if (self.masterPopoverController != nil)
- [self.masterPopoverController dismissPopoverAnimated:YES];
-}
-
-- (void)configureView
-{
- self.title = CAPITALS[_cityIndex].name;
- [self.tableView reloadData];
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
- [self configureView];
-}
-
-#pragma mark - Table view data source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 3;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return section == 0 ? 5 : 1;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- NSString * cellId = [NSString stringWithFormat:@"%d%d", indexPath.section, indexPath.row];
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:cellId];
- if (cell == nil)
- {
- if (indexPath.section == 0)
- {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cellId] autorelease];
- cell.selectionStyle = UITableViewCellSelectionStyleNone;
- switch (indexPath.row)
- {
- case 0: cell.textLabel.text = @"Latitude"; break;
- case 1: cell.textLabel.text = @"Longitude"; break;
- case 2: cell.textLabel.text = @"Country Code"; break;
- case 3: cell.textLabel.text = @"Population"; break;
- case 4: cell.textLabel.text = @"Time Zone"; break;
- default: break;
- }
- }
- else
- {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellId] autorelease];
- cell.textLabel.textAlignment = UITextAlignmentCenter;
- if (indexPath.section == 1)
- cell.textLabel.text = @"Show map and come back";
- else
- cell.textLabel.text = @"Show map and read Wikipedia";
- }
- }
-
- if (indexPath.section == 0)
- {
- City const * city = &CAPITALS[_cityIndex];
- switch (indexPath.row)
- {
- case 0: cell.detailTextLabel.text = [NSString stringWithFormat:@"%lf", city->lat]; break;
- case 1: cell.detailTextLabel.text = [NSString stringWithFormat:@"%lf", city->lon]; break;
- case 2: cell.detailTextLabel.text = city->countryCode; break;
- case 3: cell.detailTextLabel.text = [NSString stringWithFormat:@"%d", city->population]; break;
- case 4: cell.detailTextLabel.text = city->timeZone; break;
- default: break;
- }
- }
- return cell;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
- switch (indexPath.section)
- {
- case 1: [self showCapitalOnTheMap:NO]; break;
- case 2: [self showCapitalOnTheMap:YES]; break;
- default: break;
- }
-}
-
-#pragma mark - Split view
-
-- (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController
-{
- barButtonItem.title = NSLocalizedString(@"World Capitals", nil);
- [self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES];
- self.masterPopoverController = popoverController;
-}
-
-- (void)splitViewController:(UISplitViewController *)splitController willShowViewController:(UIViewController *)viewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem
-{
- // Called when the view is shown again in the split view, invalidating the button and popover controller.
- [self.navigationItem setLeftBarButtonItem:nil animated:YES];
- self.masterPopoverController = nil;
-}
-
-@end
diff --git a/api/iOS/capitals-example/Capitals/CityDetailViewController.xib b/api/iOS/capitals-example/Capitals/CityDetailViewController.xib
deleted file mode 100644
index 1f8861dc7b..0000000000
--- a/api/iOS/capitals-example/Capitals/CityDetailViewController.xib
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1552</int>
- <string key="IBDocument.SystemVersion">12E55</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">2083</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBProxyObject</string>
- <string>IBUITableView</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- </object>
- <object class="IBUITableView" id="993928743">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{768, 1024}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- <string key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics">
- <string key="IBUISimulatedSizeMetricsClass">IBUISplitViewDetailSimulatedSizeMetrics</string>
- <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <array key="dict.sortedKeys">
- <integer value="1"/>
- <integer value="3"/>
- </array>
- <array key="dict.values">
- <string>{768, 1024}</string>
- <string>{703, 768}</string>
- </array>
- </object>
- <string key="IBUITargetRuntime">IBIPadFramework</string>
- <string key="IBUIDisplayName">Detail</string>
- <string key="IBUIDestinationClass">IBUISplitViewController</string>
- <object class="NSDictionary" key="IBUIDestinationContext">
- <string key="NS.key.0">IBUISplitViewControllerContentSizeLocation</string>
- <string key="NS.object.0">IBUISplitViewControllerContentSizeLocationDetail</string>
- </object>
- </object>
- <string key="targetRuntimeIdentifier">IBIPadFramework</string>
- <bool key="IBUIBouncesZoom">NO</bool>
- <int key="IBUIStyle">1</int>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">10</float>
- <float key="IBUISectionFooterHeight">10</float>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="993928743"/>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="993928743"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">9</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="993928743"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">10</int>
- </object>
- </array>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="993928743"/>
- <reference key="parent" ref="0"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.CustomClassName">CityDetailViewController</string>
- <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="-2.CustomClassName">UIResponder</string>
- <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary" key="localizations"/>
- <nil key="sourceID"/>
- <int key="maxID">11</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">CityDetailViewController</string>
- <string key="superclassName">UITableViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/CityDetailViewController.h</string>
- </object>
- </object>
- </array>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <bool key="IBDocument.UseAutolayout">YES</bool>
- <string key="IBCocoaTouchPluginVersion">2083</string>
- </data>
-</archive>
diff --git a/api/iOS/capitals-example/Capitals/Default-568h@2x.png b/api/iOS/capitals-example/Capitals/Default-568h@2x.png
deleted file mode 100644
index cc9e79c4c7..0000000000
--- a/api/iOS/capitals-example/Capitals/Default-568h@2x.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/Default.png b/api/iOS/capitals-example/Capitals/Default.png
deleted file mode 100644
index 126d4262bc..0000000000
--- a/api/iOS/capitals-example/Capitals/Default.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/Default@2x.png b/api/iOS/capitals-example/Capitals/Default@2x.png
deleted file mode 100644
index 6468cbe05e..0000000000
--- a/api/iOS/capitals-example/Capitals/Default@2x.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/capitals-example/Capitals/MasterViewController.h b/api/iOS/capitals-example/Capitals/MasterViewController.h
deleted file mode 100644
index 03bd316108..0000000000
--- a/api/iOS/capitals-example/Capitals/MasterViewController.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-@class CityDetailViewController;
-
-@interface MasterViewController : UITableViewController
-
-@property (strong, nonatomic) CityDetailViewController * detailViewController;
-
-@end
diff --git a/api/iOS/capitals-example/Capitals/MasterViewController.m b/api/iOS/capitals-example/Capitals/MasterViewController.m
deleted file mode 100644
index 8f5c59523a..0000000000
--- a/api/iOS/capitals-example/Capitals/MasterViewController.m
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import "MasterViewController.h"
-#import "CityDetailViewController.h"
-#import "City.h"
-
-#import "MapsWithMeAPI.h"
-
-@implementation MasterViewController
-
-- (void)showAllCitiesOnTheMap:(id)sender
-{
- size_t const capitalsCount = sizeof(CAPITALS)/sizeof(CAPITALS[0]);
-
- NSMutableArray * array = [[NSMutableArray alloc] initWithCapacity:capitalsCount];
-
- for (size_t i = 0; i < capitalsCount; ++i)
- {
- NSString * pinId = [[[NSString alloc] initWithFormat:@"%ld", i] autorelease];
- // Note that url is empty - it means "More details" button for a pin in MapsWithMe will lead back to this example app
- MWMPin * pin = [[[MWMPin alloc] initWithLat:CAPITALS[i].lat lon:CAPITALS[i].lon title:CAPITALS[i].name and:pinId] autorelease];
- [array addObject:pin];
- }
-
- [MWMApi showPins:array];
-
- [array release];
-}
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
- self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
- if (self)
- {
- self.title = NSLocalizedString(@"World Capitals", nil);
- if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
- {
- self.clearsSelectionOnViewWillAppear = NO;
- self.contentSizeForViewInPopover = CGSizeMake(320.0, 600.0);
- }
- }
- return self;
-}
-
-- (void)dealloc
-{
- self.detailViewController = nil;
- [super dealloc];
-}
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
- UIBarButtonItem * showMapButton = [[[UIBarButtonItem alloc] initWithTitle:@"Show All" style:UIBarButtonItemStyleDone target:self action:@selector(showAllCitiesOnTheMap:)] autorelease];
- self.navigationItem.rightBarButtonItem = showMapButton;
-}
-
-#pragma mark - Table View
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
- return 1;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return sizeof(CAPITALS)/sizeof(CAPITALS[0]);
-}
-
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
-{
- UILabel * label = [[[UILabel alloc] initWithFrame:CGRectMake(0, 0, 240, tableView.rowHeight)] autorelease];
- label.text = [MWMApi isApiSupported] ? @"MapsWithMe is installed" : @"MapsWithMe is not installed";
- label.textAlignment = UITextAlignmentCenter;
- label.backgroundColor = [UIColor clearColor];
- return label;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-{
- return tableView.rowHeight / 2;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- static NSString * cellId = @"MasterCell";
-
- UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:cellId];
- if (cell == nil)
- {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellId] autorelease];
- if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone)
- cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
- }
-
- cell.textLabel.text = CAPITALS[indexPath.row].name;
- return cell;
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
- self.detailViewController.cityIndex = indexPath.row;
- else
- {
- if (!self.detailViewController)
- self.detailViewController = [[[CityDetailViewController alloc] initWithNibName:@"CityDetailViewController" bundle:nil] autorelease];
- self.detailViewController.cityIndex = indexPath.row;
- [self.navigationController pushViewController:self.detailViewController animated:YES];
- }
-}
-
-@end
diff --git a/api/iOS/capitals-example/Capitals/MasterViewController.xib b/api/iOS/capitals-example/Capitals/MasterViewController.xib
deleted file mode 100644
index fc3020dab2..0000000000
--- a/api/iOS/capitals-example/Capitals/MasterViewController.xib
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1552</int>
- <string key="IBDocument.SystemVersion">12E55</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.39</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">2083</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBProxyObject</string>
- <string>IBUITableView</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="371349661">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUITableView" id="709618507">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{0, 20}, {320, 548}}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAgMAA</bytes>
- <string key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
- </object>
- <bool key="IBUIClipsSubviews">YES</bool>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
- <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
- <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
- <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <array key="dict.sortedKeys">
- <integer value="1"/>
- <integer value="3"/>
- </array>
- <array key="dict.values">
- <string>{320, 568}</string>
- <string>{568, 320}</string>
- </array>
- </object>
- <string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
- <string key="IBUIDisplayName">Retina 4 Full Screen</string>
- <int key="IBUIType">2</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBUIAlwaysBounceVertical">YES</bool>
- <int key="IBUIStyle">1</int>
- <int key="IBUISeparatorStyle">2</int>
- <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
- <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
- <float key="IBUIRowHeight">44</float>
- <float key="IBUISectionHeaderHeight">10</float>
- <float key="IBUISectionFooterHeight">10</float>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="709618507"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="709618507"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">4</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="709618507"/>
- <reference key="destination" ref="841351856"/>
- </object>
- <int key="connectionID">5</int>
- </object>
- </array>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="371349661"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="709618507"/>
- <reference key="parent" ref="0"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.CustomClassName">MasterViewController</string>
- <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="-2.CustomClassName">UIResponder</string>
- <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary" key="localizations"/>
- <nil key="sourceID"/>
- <int key="maxID">5</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">MasterViewController</string>
- <string key="superclassName">UITableViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/MasterViewController.h</string>
- </object>
- </object>
- </array>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <bool key="IBDocument.UseAutolayout">YES</bool>
- <string key="IBCocoaTouchPluginVersion">2083</string>
- </data>
-</archive>
diff --git a/api/iOS/capitals-example/Capitals/main.m b/api/iOS/capitals-example/Capitals/main.m
deleted file mode 100644
index e00c54b883..0000000000
--- a/api/iOS/capitals-example/Capitals/main.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
-
- Copyright (c) 2013, MapsWithMe GmbH
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[])
-{
- @autoreleasepool
- {
- return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
- }
-}
diff --git a/api/iOS/site-resources/add_custom_url_scheme.png b/api/iOS/site-resources/add_custom_url_scheme.png
deleted file mode 100644
index d195087b4d..0000000000
--- a/api/iOS/site-resources/add_custom_url_scheme.png
+++ /dev/null
Binary files differ
diff --git a/api/iOS/site-resources/download_mwm_dialog.png b/api/iOS/site-resources/download_mwm_dialog.png
deleted file mode 100644
index ecd0349068..0000000000
--- a/api/iOS/site-resources/download_mwm_dialog.png
+++ /dev/null
Binary files differ