Changeset 12270

Timestamp:

09/14/07 11:02:29 (1 year ago)

Author:

w_i

Message:

Updated to newest

Files:

• branches/MidCOM_2_8/org.routamc.positioning/aerodrome.php (modified) (1 diff)
• branches/MidCOM_2_8/org.routamc.positioning/city.php (modified) (2 diffs)
• branches/MidCOM_2_8/org.routamc.positioning/config/config.inc (modified) (1 diff)
• branches/MidCOM_2_8/org.routamc.positioning/config/mgdschema.sql (modified) (1 diff)
• branches/MidCOM_2_8/org.routamc.positioning/config/mgdschema.xml (modified) (6 diffs)
• branches/MidCOM_2_8/org.routamc.positioning/config/midcom_dba_classes.inc (modified) (1 diff)
• branches/MidCOM_2_8/org.routamc.positioning/exec/geocode.php (added)
• branches/MidCOM_2_8/org.routamc.positioning/geocoder (added)
• branches/MidCOM_2_8/org.routamc.positioning/geocoder.php (added)
• branches/MidCOM_2_8/org.routamc.positioning/geocoder/city.php (added)
• branches/MidCOM_2_8/org.routamc.positioning/geocoder/geonames.php (added)
• branches/MidCOM_2_8/org.routamc.positioning/geocoder/yahoo.php (added)
• branches/MidCOM_2_8/org.routamc.positioning/location.php (modified) (2 diffs)
• branches/MidCOM_2_8/org.routamc.positioning/utils.php (modified) (6 diffs)

branches/MidCOM_2_8/org.routamc.positioning/aerodrome.php

@@ -19 +19 @@
-        return parent::__org_routamc_positioning_aerodrome_dba($id);
-    }
+    
+    /**
+     * @return org_routamc_positioning_city_dba City the airport caters for
+     */
+    function get_parent_guid_uncached()
+    {
+        if ($this->city)
+        {
+            $parent = new org_routamc_positioning_city_dba($this->city);
+            if (! $parent)
+            {
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Could not load City ID {$this->city} from the database, aborting.",
+                    MIDCOM_LOG_INFO);
+                debug_pop();
+                return null;
+            }
+            return $parent->guid;
+        }
+
+        return null;
+    }
+
+    /**
+     * Human-readable label for cases like Asgard navigation
+     */
+    function get_label()
+    {
+        if (!empty($this->name))
+        {
+            return "{$this->icao} ({$this->name})";
+        }
+        return $this->icao;
+    }
+    
+    /**
+     * Don't save aerodrome if another aerodrome is in same place or exists with same ICAO
+     */
+    function _on_creating()
+    {
+        if (   $this->longitude
+            && $this->latitude)
+        {
+            $qb = org_routamc_positioning_aerodrome_dba::new_query_builder();
+            $qb->add_constraint('longitude', '=', $this->longitude);
+            $qb->add_constraint('latitude', '=', $this->latitude);
+            $qb->set_limit(1);
+            $matches = $qb->execute_unchecked();
+            if (count($matches) > 0)
+            {
+                // We don't need to save duplicate entries
+                return false;
+            }
+        }
+        
+        $qb = org_routamc_positioning_aerodrome_dba::new_query_builder();
+        $qb->add_constraint('icao', '=', $this->icao);
+        $qb->set_limit(1);
+        $matches = $qb->execute_unchecked();
+        if (count($matches) > 0)
+        {
+            // We don't need to save duplicate entries
+            return false;
+        }
+        return parent::_on_creating();
+    }
-}
-?>

branches/MidCOM_2_8/org.routamc.positioning/city.php

@@ -19 +19 @@
-        return parent::__org_routamc_positioning_city_dba($id);
-    }
+    
+    /**
+     * Human-readable label for cases like Asgard navigation
+     */
+    function get_label()
+    {
+        return $this->city;
+    }
+
+    /**
+     * @return org_routamc_positioning_country_dba Country the city is in
+     */
+    function get_parent_guid_uncached()
+    {
+        if ($this->country)
+        {
+            $qb = org_routamc_positioning_country_dba::new_query_builder();
+            $qb->add_constraint('code', '=', $this->country);
+            $countries = $qb->execute();
+            if (count($countries) == 0)
+            {
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Could not load Country ID {$this->country} from the database, aborting.",
+                    MIDCOM_LOG_INFO);
+                debug_pop();
+                return null;
+            }
+            return $countries[0]->guid;
+        }
+
+        return null;
+    }
-
-    /**
@@ -37 +69 @@
-        return parent::_on_creating();
-    }
+    
+    function get_by_name($name)
+    {
+        $qb = org_routamc_positioning_city_dba::new_query_builder();
+        $qb->begin_group('OR');
+        $qb->add_constraint('city', '=', $name);
+        $qb->add_constraint('alternatenames', 'LIKE', "%{$name}%");
+        $qb->end_group();
+        
+        $qb->set_limit(1);
+        
+        $matches = $qb->execute_unchecked();
+        if (count($matches) > 0)
+        {
+            return $matches[0];
+        }
+        
+        return false;
+    }
-}
-?>

branches/MidCOM_2_8/org.routamc.positioning/config/config.inc

@@ -9 +9 @@
-
-'plazes_developer_key' => '4c637b4469bc11d13e73aa18a55ff6e6',
+
+'map_provider' => 'google',
+'map_api_key'  => '',
+
+'yahoo_application_key' => '',

branches/MidCOM_2_8/org.routamc.positioning/config/mgdschema.sql

@@ -53 +53 @@
-ALTER TABLE org_routamc_positioning_aerodrome ADD COLUMN revised datetime NOT NULL default '0000-00-00 00:00:00';
-ALTER TABLE org_routamc_positioning_aerodrome ADD COLUMN revision int(11) NOT NULL default '0';
+ALTER TABLE org_routamc_positioning_aerodrome ADD COLUMN wmo varchar(255) NOT NULL default '';
+ALTER TABLE org_routamc_positioning_aerodrome ADD COLUMN country varchar(2) NOT NULL default '';
-##
-#Log

branches/MidCOM_2_8/org.routamc.positioning/config/mgdschema.xml

@@ -2 +2 @@
-<Schema xmlns="http://www.midgard-project.org/repligard/1.4">
-
+    <!-- Country -->
+    <type name="org_routamc_positioning_country" table="org_routamc_positioning_country">
+        <property name="id" type="integer" primaryfield="id"/>
+        <!-- Country in ISO 3166-1 alpha-2 two letter format -->
+        <property name="code" type="string"/>
+        <!-- Country in ISO 3166-1 alpha-3 three letter format -->
+        <property name="code3" type="string"/>        
+        <property name="codenumeric" type="string"/>          
+        <!-- Country in FIPS two letter format -->
+        <property name="fips" type="string"/>        
+        
+        <property name="name" type="string"/>
+        <!-- TODO: Alternate names should probably be a MultiLang table -->
+        <property name="alternatenames" type="string"/>
+
+        <!-- Metadata -->        
+        <property name="population" type="integer"/>
+        <!-- Area is in square km -->
+        <property name="area" type="float"/>
+        <property name="currency" type="string"/>
+        <property name="continent" type="string"/>
+        <property name="capital" type="integer" link="org_routamc_positioning_city:id" reverse="no"/>
+        
+        <!-- Coordinates in decimal format -->
+        <property name="bboxwest" type="float"/>
+        <property name="bboxnorth" type="float"/>
+        <property name="bboxeast" type="float"/>
+        <property name="bboxsouth" type="float"/>
+    </type>
+
-    <!-- City is used for mapping log entries to "real-world places" -->
-
+ parentfield="country"
-        <property name="id" type="integer" primaryfield="id"/>
-text
+string
-        <!-- Country in ISO 3166-1 alpha-2 two letter format -->
-text"
-text
+string" link="org_routamc_positioning_country:code" parentfield="country" reverse="no" 
+string
-        <!-- TODO: Alternate names should probably be a MultiLang table -->
-text
+string
-        <property name="population" type="integer"/>
-        <!-- Coordinates in decimal format -->
-double
-double
+float
+float
-        <property name="altitude" type="integer"/>
-
-        <!-- required metadata -->
-        <property name="revised" type="string"/>
-        <property name="revision" type="integer"/>
-        <property name="created" type="string"/>
-        <property name="creator" link="midgard_person:id" reverse="no" type="integer"/>
-        <property name="revisor" link="midgard_person:id" reverse="no" type="integer"/>
-        <!-- /required metadata -->
-    </type>
-
@@ -29 +51 @@
-    <type name="org_routamc_positioning_aerodrome" table="org_routamc_positioning_aerodrome" parent="org_routamc_positioning_city" parentfield="city">
-        <property name="id" type="integer" primaryfield="id"/>
-
-
-
+
+
+
+
-        <property name="city" link="org_routamc_positioning_city:id" reverse="no" type="integer" parentfield="city"/>
+        <property name="country" link="org_routamc_positioning_country:code" reverse="no" type="string"/>
-        <!-- Coordinates in decimal format -->
-        <property name="latitude" type="float"/>
@@ -39 +63 @@
-        <!-- Runway altitude in meters -->
-        <property name="altitude" type="float"/>
-
-        <!-- required metadata -->
-        <property name="revised" type="string"/>
-        <property name="revision" type="integer"/>
-        <property name="created" type="string"/>
-        <property name="creator" link="midgard_person:id" reverse="no" type="integer"/>
-        <property name="revisor" link="midgard_person:id" reverse="no" type="integer"/>
-        <!-- /required metadata -->
-    </type>
-
@@ -63 +79 @@
-            objectlocation: Location acquired through an object's location
-        -->
-text
+string
-
-        <!--
@@ -82 +98 @@
-        <!-- Bearing in degrees -->
-        <property name="bearing" type="integer"/>
-
-        <!-- required metadata -->
-        <property name="revised" type="string"/>
-        <property name="revision" type="integer"/>
-        <property name="created" type="string"/>
-        <property name="creator" link="midgard_person:id" reverse="no" type="integer"/>
-        <property name="revisor" link="midgard_person:id" reverse="no" type="integer"/>
-        <!-- /required metadata -->
-    </type>
-
-    <!-- Locations are used for connecting any Midgard object into real-world positions -->
-
+ parentfield="log"
-        <property name="id" type="integer" primaryfield="id"/>
-
-        <!-- Parent object GUID -->
-text
+string
-        <!-- Parent object class -->
-text
+string
-        <!-- Parent component -->
-text
+string
-
-        <!-- Log entry this position information is based on if type is set to "10" -->
-
+
+
-        <property name="date" type="integer"/>
-
@@ -115 +124 @@
-        <property name="relation" type="integer"/>
-
-
+, mapping to XEP-0080 lat and lon
-        <property name="latitude" type="float"/>
-        <property name="longitude" type="float"/>
-
-
+, mapping to XEP-0080 alt
-        <property name="altitude" type="float"/>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    </type>
-</Schema>

branches/MidCOM_2_8/org.routamc.positioning/config/midcom_dba_classes.inc

@@ +1 @@
+array(
+    'table' => 'org_routamc_positioning_country',
+    'old_class_name' => null,
+    'new_class_name' => 'org_routamc_positioning_country',
+    'midcom_class_name' => 'org_routamc_positioning_country_dba'
+),
-array(
-    'table' => 'org_routamc_positioning_city',

branches/MidCOM_2_8/org.routamc.positioning/location.php

@@ -19 +19 @@
-        return parent::__org_routamc_positioning_location_dba($id);
-    }
+    
+    /**
+     * Human-readable label for cases like Asgard navigation
+     */
+    function get_label()
+    {
+        if ($this->parent)
+        {
+            $parent = $this->get_parent();
+            if ($parent)
+            {
+                $label = $parent->guid;
+                if (isset($parent->title))
+                {
+                    $label = $parent->title;
+                }
+                elseif (method_exists($parent, 'get_label'))
+                {
+                    $label = $parent->get_label();
+                }
+                return "{$this->parentclass} {$label}";
+            }
+        }
+        return "{$this->parentclass} #{$this->id}";
+    }
-
-    /**
@@ -30 +55 @@
-            && $this->parentclass)
-        {
+            if (!class_exists($this->parentclass))
+            {
+                if (empty($this->parentcomponent))
+                {
+                    return null;
+                }
+                $_MIDCOM->componentloader->load_graceful($this->parentcomponent);
+            }
-            $classname = $this->parentclass;
-            $parent = new $classname($this->parent);

branches/MidCOM_2_8/org.routamc.positioning/utils.php

@@ -267 +267 @@
-            case 'org_routamc_positioning_log_dba':
-            case 'org_routamc_positioning_city_dba':
-
+e
-                // Real position entry, query it directly
-                $classname = $class;
@@ -287 +287 @@
-     * @return Array Array of MidCOM DBA objects sorted by proximity
-     */
-0
+1
-    {
-        $classname = org_routamc_positioning_utils::get_positioning_class($class);
@@ -298 +298 @@
-            $direct = true;
-        }
-
-        $qb =  $_MIDCOM->dbfactory->new_query_builder($classname);
-
@@ -335 +334 @@
-
-
+                if (!isset($current_locale))
+                {
+                        $current_locale = setlocale(LC_NUMERIC,"0");
+                        setlocale(LC_NUMERIC,"C");
+                }
+
-        $qb->begin_group('AND');
-
+(float) 
-        $qb->add_constraint('latitude', '>', (float) $to['latitude']);
-        $qb->end_group();
@@ -381 +386 @@
-
-            $modifier = $modifier * 1.05;
+                        setlocale(LC_NUMERIC,$current_locale);
-            return org_routamc_positioning_utils::get_closest($class, $center, $limit, $modifier);
-        }
@@ -411 +417 @@
-            array_pop($closest);
-        }
-
+
-        return $closest;
-    }