projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
Fix html validation errors on trip view
Fix html validation errors on trip view

file:a/.box (deleted) 
--- a/.box
+++ /dev/null
@@ -1,5 +1,1 @@
-shared_writable_dirs:
-    - /labs/tiles
-    - /lib/staticmaplite/cache
-php_extensions: [pgsql, pdo, pdo_pgsql, curl]
file:b/Boxfile (new) 
--- /dev/null
+++ b/Boxfile
@@ -1,1 +1,7 @@
+web1: 
+  php_extensions: 
+    - pgsql
+    - pdo
+    - pdo_pgsql
+    - curl
file:a/about.php -> file:b/about.php 
--- a/about.php
+++ b/about.php
@@ -34,8 +34,10 @@
     <br />
     Some icons by Joseph Wain / glyphish.com<br />
     Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>
-    , <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>) 
-    and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
+    , <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>, <a href="http://itunes.apple.com/app/bus-trips-act/id489146525?mt=8">Bus Trips ACT by Molson Chengalath</a>) 
+    , Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>, <A href="https://market.android.com/details?id=GetMe2CanberraFree.source">GetMe2 Canberra by
+Colin Thompson </a>) 
+    and Windows Phone 7 (<a href="http://www.windowsphone.com/en-AU/apps/d840375e-429c-4aa4-a358-80eec6ea9e66">TransHub Canberra by Soul Solutions</a>) Other web clients include <a href="http://canberra.itranzit.com/option.html">iTranzit</a>.
     <br />
     GTFS-realtime API:
     Alerts and Trip Updates (but only Cancelled or Stop Skipped)
file:a/aws/busuidb.sh -> file:b/aws/busuidb.sh 
--- a/aws/busuidb.sh
+++ b/aws/busuidb.sh
@@ -7,8 +7,13 @@
 psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
 #createuser transitdata -SDRP
 #password transitdata
-#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;"
+#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips\
+#,servicealerts_alerts,servicealerts_informed TO transitdata;"
 #psql -d transitdata -c "GRANT SELECT,INSERT ON	TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"
 #psql -d transitdata -c	"GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"
 ##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"
+## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")
+##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)
+##FROM shapes LIMIT 1;
 php /var/www/updatedb.php
+
file:a/aws/transitdata.sql -> file:b/aws/transitdata.sql 
--- a/aws/transitdata.sql
+++ b/aws/transitdata.sql
@@ -4,7 +4,7 @@
 
 -- Dumped from database version 9.0.4
 -- Dumped by pg_dump version 9.0.4
--- Started on 2011-10-10 16:28:13
+-- Started on 2011-10-11 23:16:11
 
 SET statement_timeout = 0;
 SET client_encoding = 'UTF8';
@@ -14,26 +14,7 @@
 SET escape_string_warning = off;
 
 --
--- TOC entry 2766 (class 1262 OID 18349)
--- Name: transitdata; Type: DATABASE; Schema: -; Owner: postgres
---
-
-CREATE DATABASE transitdata WITH TEMPLATE = template0 ENCODING = 'UTF8' LC_COLLATE = 'English_Australia.1252' LC_CTYPE = 'English_Australia.1252';
-
-
-ALTER DATABASE transitdata OWNER TO postgres;
-
-\connect transitdata
-
-SET statement_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = off;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-SET escape_string_warning = off;
-
---
--- TOC entry 1167 (class 2612 OID 11574)
+-- TOC entry 1168 (class 2612 OID 11574)
 -- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: postgres
 --
 
@@ -80,7 +61,7 @@
 
 --
 -- TOC entry 1087 (class 1247 OID 18350)
--- Dependencies: 19 6 15
+-- Dependencies: 6 15 19
 -- Name: box2d; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -131,7 +112,7 @@
 
 --
 -- TOC entry 1090 (class 1247 OID 18354)
--- Dependencies: 20 6 21
+-- Dependencies: 6 21 20
 -- Name: box3d; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -182,7 +163,7 @@
 
 --
 -- TOC entry 1093 (class 1247 OID 18358)
--- Dependencies: 6 22 23
+-- Dependencies: 6 23 22
 -- Name: box3d_extent; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -323,7 +304,7 @@
 
 --
 -- TOC entry 1099 (class 1247 OID 18366)
--- Dependencies: 30 29 26 6 27 28
+-- Dependencies: 26 6 27 28 29 30
 -- Name: geography; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -416,7 +397,7 @@
 
 --
 -- TOC entry 1102 (class 1247 OID 18373)
--- Dependencies: 6 31 35 34 33 32
+-- Dependencies: 33 34 35 31 6 32
 -- Name: geometry; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -437,7 +418,7 @@
 
 --
 -- TOC entry 1105 (class 1247 OID 18382)
--- Dependencies: 6 2407
+-- Dependencies: 6 2408
 -- Name: geometry_dump; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -485,7 +466,7 @@
 
 --
 -- TOC entry 1107 (class 1247 OID 18383)
--- Dependencies: 37 6 36
+-- Dependencies: 37 36 6
 -- Name: gidx; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -536,7 +517,7 @@
 
 --
 -- TOC entry 1110 (class 1247 OID 18387)
--- Dependencies: 39 38 6
+-- Dependencies: 38 6 39
 -- Name: pgis_abs; Type: TYPE; Schema: public; Owner: postgres
 --
 
@@ -630,7 +611,7 @@
 
 --
 -- TOC entry 44 (class 1255 OID 18397)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: _st_asgml(integer, geometry, integer, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -656,7 +637,7 @@
 
 --
 -- TOC entry 46 (class 1255 OID 18399)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: _st_askml(integer, geometry, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -682,7 +663,7 @@
 
 --
 -- TOC entry 49 (class 1255 OID 18402)
--- Dependencies: 6 1099
+-- Dependencies: 1099 6
 -- Name: _st_bestsrid(geography); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -695,7 +676,7 @@
 
 --
 -- TOC entry 48 (class 1255 OID 18401)
--- Dependencies: 1099 6 1099
+-- Dependencies: 6 1099 1099
 -- Name: _st_bestsrid(geography, geography); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -721,7 +702,7 @@
 
 --
 -- TOC entry 51 (class 1255 OID 18404)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: _st_contains(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -734,7 +715,7 @@
 
 --
 -- TOC entry 52 (class 1255 OID 18405)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: _st_containsproperly(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -747,7 +728,7 @@
 
 --
 -- TOC entry 53 (class 1255 OID 18406)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: _st_coveredby(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -786,7 +767,7 @@
 
 --
 -- TOC entry 56 (class 1255 OID 18409)
--- Dependencies: 1102 6 1102
+-- Dependencies: 1102 1102 6
 -- Name: _st_crosses(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -812,7 +793,7 @@
 
 --
 -- TOC entry 58 (class 1255 OID 18411)
--- Dependencies: 1099 1099 6
+-- Dependencies: 1099 6 1099
 -- Name: _st_distance(geography, geography, double precision, boolean); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -825,7 +806,7 @@
 
 --
 -- TOC entry 59 (class 1255 OID 18412)
--- Dependencies: 1102 6 1167 1105
+-- Dependencies: 6 1168 1105 1102
 -- Name: _st_dumppoints(geometry, integer[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -956,7 +937,7 @@
 
 --
 -- TOC entry 63 (class 1255 OID 18416)
--- Dependencies: 6 1099 1099
+-- Dependencies: 1099 1099 6
 -- Name: _st_expand(geography, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -969,7 +950,7 @@
 
 --
 -- TOC entry 64 (class 1255 OID 18417)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: _st_intersects(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -982,7 +963,7 @@
 
 --
 -- TOC entry 65 (class 1255 OID 18418)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: _st_linecrossingdirection(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1021,7 +1002,7 @@
 
 --
 -- TOC entry 68 (class 1255 OID 18421)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: _st_orderingequals(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1047,7 +1028,7 @@
 
 --
 -- TOC entry 70 (class 1255 OID 18423)
--- Dependencies: 1099 6 1099
+-- Dependencies: 6 1099 1099
 -- Name: _st_pointoutside(geography); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1060,7 +1041,7 @@
 
 --
 -- TOC entry 71 (class 1255 OID 18424)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: _st_touches(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1086,7 +1067,7 @@
 
 --
 -- TOC entry 73 (class 1255 OID 18426)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: addauth(text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1126,7 +1107,7 @@
 
 --
 -- TOC entry 74 (class 1255 OID 18427)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: addbbox(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1139,7 +1120,7 @@
 
 --
 -- TOC entry 79 (class 1255 OID 18430)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: addgeometrycolumn(character varying, character varying, integer, character varying, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1159,7 +1140,7 @@
 
 --
 -- TOC entry 78 (class 1255 OID 18429)
--- Dependencies: 6 1167
+-- Dependencies: 6 1168
 -- Name: addgeometrycolumn(character varying, character varying, character varying, integer, character varying, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1179,7 +1160,7 @@
 
 --
 -- TOC entry 77 (class 1255 OID 18428)
--- Dependencies: 6 1167
+-- Dependencies: 6 1168
 -- Name: addgeometrycolumn(character varying, character varying, character varying, character varying, integer, character varying, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1380,7 +1361,7 @@
 
 --
 -- TOC entry 80 (class 1255 OID 18431)
--- Dependencies: 1102 6 1102 1102
+-- Dependencies: 6 1102 1102 1102
 -- Name: addpoint(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1393,7 +1374,7 @@
 
 --
 -- TOC entry 81 (class 1255 OID 18432)
--- Dependencies: 1102 1102 1102 6
+-- Dependencies: 6 1102 1102 1102
 -- Name: addpoint(geometry, geometry, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1406,20 +1387,20 @@
 
 --
 -- TOC entry 83 (class 1255 OID 18434)
+-- Dependencies: 1102 6 1102
+-- Name: affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision); Type: FUNCTION; Schema: public; Owner: postgres
+--
+
+CREATE FUNCTION affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision) RETURNS geometry
+    LANGUAGE sql IMMUTABLE STRICT
+    AS $_$SELECT affine($1,  $2, $3, 0,  $4, $5, 0,  0, 0, 1,  $6, $7, 0)$_$;
+
+
+ALTER FUNCTION public.affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision) OWNER TO postgres;
+
+--
+-- TOC entry 82 (class 1255 OID 18433)
 -- Dependencies: 1102 1102 6
--- Name: affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision); Type: FUNCTION; Schema: public; Owner: postgres
---
-
-CREATE FUNCTION affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision) RETURNS geometry
-    LANGUAGE sql IMMUTABLE STRICT
-    AS $_$SELECT affine($1,  $2, $3, 0,  $4, $5, 0,  0, 0, 1,  $6, $7, 0)$_$;
-
-
-ALTER FUNCTION public.affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision) OWNER TO postgres;
-
---
--- TOC entry 82 (class 1255 OID 18433)
--- Dependencies: 6 1102 1102
 -- Name: affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1458,7 +1439,7 @@
 
 --
 -- TOC entry 86 (class 1255 OID 18437)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: asbinary(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1471,7 +1452,7 @@
 
 --
 -- TOC entry 87 (class 1255 OID 18438)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: asbinary(geometry, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1484,7 +1465,7 @@
 
 --
 -- TOC entry 88 (class 1255 OID 18439)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: asewkb(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1523,20 +1504,20 @@
 
 --
 -- TOC entry 92 (class 1255 OID 18443)
+-- Dependencies: 6 1102
+-- Name: asgml(geometry); Type: FUNCTION; Schema: public; Owner: postgres
+--
+
+CREATE FUNCTION asgml(geometry) RETURNS text
+    LANGUAGE sql IMMUTABLE STRICT
+    AS $_$SELECT _ST_AsGML(2, $1, 15, 0)$_$;
+
+
+ALTER FUNCTION public.asgml(geometry) OWNER TO postgres;
+
+--
+-- TOC entry 91 (class 1255 OID 18442)
 -- Dependencies: 1102 6
--- Name: asgml(geometry); Type: FUNCTION; Schema: public; Owner: postgres
---
-
-CREATE FUNCTION asgml(geometry) RETURNS text
-    LANGUAGE sql IMMUTABLE STRICT
-    AS $_$SELECT _ST_AsGML(2, $1, 15, 0)$_$;
-
-
-ALTER FUNCTION public.asgml(geometry) OWNER TO postgres;
-
---
--- TOC entry 91 (class 1255 OID 18442)
--- Dependencies: 6 1102
 -- Name: asgml(geometry, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1562,7 +1543,7 @@
 
 --
 -- TOC entry 94 (class 1255 OID 18445)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: ashexewkb(geometry, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1575,7 +1556,7 @@
 
 --
 -- TOC entry 96 (class 1255 OID 18447)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: askml(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1588,7 +1569,7 @@
 
 --
 -- TOC entry 95 (class 1255 OID 18446)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: askml(geometry, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1640,7 +1621,7 @@
 
 --
 -- TOC entry 98 (class 1255 OID 18449)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: assvg(geometry, integer, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1666,7 +1647,7 @@
 
 --
 -- TOC entry 102 (class 1255 OID 18453)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: azimuth(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1679,7 +1660,7 @@
 
 --
 -- TOC entry 103 (class 1255 OID 18454)
--- Dependencies: 1102 1167 6
+-- Dependencies: 1102 1168 6
 -- Name: bdmpolyfromtext(text, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1710,7 +1691,7 @@
 
 --
 -- TOC entry 75 (class 1255 OID 18455)
--- Dependencies: 6 1102 1167
+-- Dependencies: 6 1168 1102
 -- Name: bdpolyfromtext(text, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1746,7 +1727,7 @@
 
 --
 -- TOC entry 76 (class 1255 OID 18456)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: boundary(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1759,7 +1740,7 @@
 
 --
 -- TOC entry 104 (class 1255 OID 18457)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: box(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1772,7 +1753,7 @@
 
 --
 -- TOC entry 105 (class 1255 OID 18458)
--- Dependencies: 1090 6
+-- Dependencies: 6 1090
 -- Name: box(box3d); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1785,7 +1766,7 @@
 
 --
 -- TOC entry 106 (class 1255 OID 18459)
--- Dependencies: 6 1093 1087
+-- Dependencies: 6 1087 1093
 -- Name: box2d(box3d_extent); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1798,7 +1779,7 @@
 
 --
 -- TOC entry 107 (class 1255 OID 18460)
--- Dependencies: 1087 6 1102
+-- Dependencies: 6 1087 1102
 -- Name: box2d(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1824,7 +1805,7 @@
 
 --
 -- TOC entry 109 (class 1255 OID 18462)
--- Dependencies: 6 1102 1090
+-- Dependencies: 6 1090 1102
 -- Name: box3d(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1837,7 +1818,7 @@
 
 --
 -- TOC entry 110 (class 1255 OID 18463)
--- Dependencies: 1087 1090 6
+-- Dependencies: 6 1090 1087
 -- Name: box3d(box2d); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1850,7 +1831,7 @@
 
 --
 -- TOC entry 111 (class 1255 OID 18464)
--- Dependencies: 1093 1090 6
+-- Dependencies: 6 1090 1093
 -- Name: box3d_extent(box3d_extent); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1863,7 +1844,7 @@
 
 --
 -- TOC entry 112 (class 1255 OID 18465)
--- Dependencies: 1090 6
+-- Dependencies: 6 1090
 -- Name: box3dtobox(box3d); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1876,7 +1857,7 @@
 
 --
 -- TOC entry 113 (class 1255 OID 18466)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: buffer(geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1902,7 +1883,7 @@
 
 --
 -- TOC entry 115 (class 1255 OID 18468)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: buildarea(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1915,7 +1896,7 @@
 
 --
 -- TOC entry 116 (class 1255 OID 18469)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: bytea(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -1954,7 +1935,7 @@
 
 --
 -- TOC entry 118 (class 1255 OID 18471)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: checkauth(text, text, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2016,7 +1997,7 @@
 
 --
 -- TOC entry 122 (class 1255 OID 18475)
--- Dependencies: 1087 6 1087 1102
+-- Dependencies: 6 1087 1087 1102
 -- Name: combine_bbox(box2d, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2081,7 +2062,7 @@
 
 --
 -- TOC entry 127 (class 1255 OID 18480)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: convexhull(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2107,7 +2088,7 @@
 
 --
 -- TOC entry 129 (class 1255 OID 18482)
--- Dependencies: 1096 6
+-- Dependencies: 6 1096
 -- Name: datatype(chip); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2120,7 +2101,7 @@
 
 --
 -- TOC entry 130 (class 1255 OID 18483)
--- Dependencies: 1102 1102 1102 6
+-- Dependencies: 6 1102 1102 1102
 -- Name: difference(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2133,7 +2114,7 @@
 
 --
 -- TOC entry 131 (class 1255 OID 18484)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: dimension(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2146,7 +2127,7 @@
 
 --
 -- TOC entry 132 (class 1255 OID 18485)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: disablelongtransactions(); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2205,7 +2186,7 @@
 
 --
 -- TOC entry 134 (class 1255 OID 18487)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: distance(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2218,7 +2199,7 @@
 
 --
 -- TOC entry 135 (class 1255 OID 18488)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: distance_sphere(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2231,7 +2212,7 @@
 
 --
 -- TOC entry 136 (class 1255 OID 18489)
--- Dependencies: 1102 6 1113 1102
+-- Dependencies: 6 1102 1102 1113
 -- Name: distance_spheroid(geometry, geometry, spheroid); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2244,7 +2225,7 @@
 
 --
 -- TOC entry 137 (class 1255 OID 18490)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: dropbbox(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2257,7 +2238,7 @@
 
 --
 -- TOC entry 140 (class 1255 OID 18493)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: dropgeometrycolumn(character varying, character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2277,7 +2258,7 @@
 
 --
 -- TOC entry 139 (class 1255 OID 18492)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: dropgeometrycolumn(character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2297,7 +2278,7 @@
 
 --
 -- TOC entry 138 (class 1255 OID 18491)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: dropgeometrycolumn(character varying, character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2391,7 +2372,7 @@
 
 --
 -- TOC entry 141 (class 1255 OID 18494)
--- Dependencies: 6 1167
+-- Dependencies: 6 1168
 -- Name: dropgeometrytable(character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2435,7 +2416,7 @@
 
 --
 -- TOC entry 144 (class 1255 OID 18497)
--- Dependencies: 1102 6 1105
+-- Dependencies: 6 1105 1102
 -- Name: dump(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2461,7 +2442,7 @@
 
 --
 -- TOC entry 146 (class 1255 OID 18499)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: enablelongtransactions(); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2522,7 +2503,7 @@
 
 --
 -- TOC entry 147 (class 1255 OID 18500)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: endpoint(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2548,7 +2529,7 @@
 
 --
 -- TOC entry 149 (class 1255 OID 18502)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: equals(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2574,7 +2555,7 @@
 
 --
 -- TOC entry 150 (class 1255 OID 18503)
--- Dependencies: 1087 6
+-- Dependencies: 6 1087
 -- Name: estimated_extent(text, text, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2600,7 +2581,7 @@
 
 --
 -- TOC entry 153 (class 1255 OID 18506)
--- Dependencies: 1087 6 1087
+-- Dependencies: 6 1087 1087
 -- Name: expand(box2d, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2613,7 +2594,7 @@
 
 --
 -- TOC entry 154 (class 1255 OID 18507)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: expand(geometry, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2639,7 +2620,7 @@
 
 --
 -- TOC entry 156 (class 1255 OID 18509)
--- Dependencies: 1096 6
+-- Dependencies: 6 1096
 -- Name: factor(chip); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2652,7 +2633,7 @@
 
 --
 -- TOC entry 158 (class 1255 OID 18511)
--- Dependencies: 1087 1167 6
+-- Dependencies: 6 1168 1087
 -- Name: find_extent(text, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2676,7 +2657,7 @@
 
 --
 -- TOC entry 157 (class 1255 OID 18510)
--- Dependencies: 1087 1167 6
+-- Dependencies: 6 1168 1087
 -- Name: find_extent(text, text, text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2701,7 +2682,7 @@
 
 --
 -- TOC entry 159 (class 1255 OID 18512)
--- Dependencies: 6 1167
+-- Dependencies: 6 1168
 -- Name: find_srid(character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2747,7 +2728,7 @@
 
 --
 -- TOC entry 160 (class 1255 OID 18513)
--- Dependencies: 6 1167
+-- Dependencies: 6 1168
 -- Name: fix_geometry_columns(); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2813,7 +2794,7 @@
 
 --
 -- TOC entry 161 (class 1255 OID 18514)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: force_2d(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2826,7 +2807,7 @@
 
 --
 -- TOC entry 162 (class 1255 OID 18515)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: force_3d(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2839,7 +2820,7 @@
 
 --
 -- TOC entry 163 (class 1255 OID 18516)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: force_3dm(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2865,7 +2846,7 @@
 
 --
 -- TOC entry 165 (class 1255 OID 18518)
--- Dependencies: 1102 1102 6
+-- Dependencies: 6 1102 1102
 -- Name: force_4d(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2878,7 +2859,7 @@
 
 --
 -- TOC entry 166 (class 1255 OID 18519)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: force_collection(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2891,7 +2872,7 @@
 
 --
 -- TOC entry 167 (class 1255 OID 18520)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: forcerhr(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2904,7 +2885,7 @@
 
 --
 -- TOC entry 169 (class 1255 OID 18522)
--- Dependencies: 6 1102 1099
+-- Dependencies: 6 1099 1102
 -- Name: geography(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2930,7 +2911,7 @@
 
 --
 -- TOC entry 170 (class 1255 OID 18523)
--- Dependencies: 1099 1099 6
+-- Dependencies: 6 1099 1099
 -- Name: geography_cmp(geography, geography); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -2943,7 +2924,7 @@
 
 --
 -- TOC entry 171 (class 1255 OID 18524)
--- Dependencies: 1099 6 1099
+-- Dependencies: 6 1099 1099
 -- Name: geography_eq(geography, geography); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -3047,7 +3028,7 @@
 
 --
 -- TOC entry 179 (class 1255 OID 18532)
--- Dependencies: 1087 6 1087
+-- Dependencies: 6 1087 1087
 -- Name: geography_gist_same(box2d, box2d, internal); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -3457,7 +3438,7 @@
 
 --
 -- TOC entry 209 (class 1255 OID 18562)
--- Dependencies: 6 1102 1102
+-- Dependencies: 1102 6 1102
 -- Name: geometry_gt(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -3756,7 +3737,7 @@
 
 --
 -- TOC entry 232 (class 1255 OID 18585)
--- Dependencies: 6 1167
+-- Dependencies: 6 1168
 -- Name: get_proj4_from_srid(integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -3968,7 +3949,7 @@
 
 --
 -- TOC entry 248 (class 1255 OID 18601)
--- Dependencies: 6 1102 1113
+-- Dependencies: 1102 6 1113
 -- Name: length2d_spheroid(geometry, spheroid); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -3981,7 +3962,7 @@
 
 --
 -- TOC entry 249 (class 1255 OID 18602)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: length3d(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4226,7 +4207,7 @@
 
 --
 -- TOC entry 266 (class 1255 OID 18619)
--- Dependencies: 6 1102 1102
+-- Dependencies: 1102 1102 6
 -- Name: locate_between_measures(geometry, double precision, double precision); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4278,7 +4259,7 @@
 
 --
 -- TOC entry 267 (class 1255 OID 18620)
--- Dependencies: 1167 6
+-- Dependencies: 6 1168
 -- Name: lockrow(text, text, text, text, timestamp without time zone); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4336,7 +4317,7 @@
 
 --
 -- TOC entry 271 (class 1255 OID 18624)
--- Dependencies: 1167 6
+-- Dependencies: 1168 6
 -- Name: longtransactionsenabled(); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4372,7 +4353,7 @@
 
 --
 -- TOC entry 273 (class 1255 OID 18626)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: lwgeom_gist_consistent(internal, geometry, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4424,7 +4405,7 @@
 
 --
 -- TOC entry 277 (class 1255 OID 18630)
--- Dependencies: 1087 6 1087
+-- Dependencies: 6 1087 1087
 -- Name: lwgeom_gist_same(box2d, box2d, internal); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4450,7 +4431,7 @@
 
 --
 -- TOC entry 279 (class 1255 OID 18632)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: m(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4463,7 +4444,7 @@
 
 --
 -- TOC entry 280 (class 1255 OID 18633)
--- Dependencies: 1087 6 1102 1102
+-- Dependencies: 1102 6 1087 1102
 -- Name: makebox2d(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4476,7 +4457,7 @@
 
 --
 -- TOC entry 281 (class 1255 OID 18634)
--- Dependencies: 1102 6 1102 1090
+-- Dependencies: 1090 6 1102 1102
 -- Name: makebox3d(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4489,7 +4470,7 @@
 
 --
 -- TOC entry 282 (class 1255 OID 18635)
--- Dependencies: 1102 6 1102 1102
+-- Dependencies: 6 1102 1102 1102
 -- Name: makeline(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4567,7 +4548,7 @@
 
 --
 -- TOC entry 289 (class 1255 OID 18642)
--- Dependencies: 1102 6 1102
+-- Dependencies: 6 1102 1102
 -- Name: makepolygon(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4580,7 +4561,7 @@
 
 --
 -- TOC entry 288 (class 1255 OID 18641)
--- Dependencies: 6 1104 1102 1102
+-- Dependencies: 1104 6 1102 1102
 -- Name: makepolygon(geometry, geometry[]); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4593,7 +4574,7 @@
 
 --
 -- TOC entry 290 (class 1255 OID 18643)
--- Dependencies: 6 1102 1102
+-- Dependencies: 1102 1102 6
 -- Name: max_distance(geometry, geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4606,7 +4587,7 @@
 
 --
 -- TOC entry 291 (class 1255 OID 18644)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: mem_size(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4636,7 +4617,7 @@
 
 --
 -- TOC entry 292 (class 1255 OID 18645)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: mlinefromtext(text, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4654,7 +4635,7 @@
 
 --
 -- TOC entry 295 (class 1255 OID 18648)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: mlinefromwkb(bytea); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4671,7 +4652,7 @@
 
 --
 -- TOC entry 294 (class 1255 OID 18647)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: mlinefromwkb(bytea, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4705,7 +4686,7 @@
 
 --
 -- TOC entry 296 (class 1255 OID 18649)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: mpointfromtext(text, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4739,7 +4720,7 @@
 
 --
 -- TOC entry 298 (class 1255 OID 18651)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: mpointfromwkb(bytea, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4756,7 +4737,7 @@
 
 --
 -- TOC entry 301 (class 1255 OID 18654)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: mpolyfromtext(text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4773,7 +4754,7 @@
 
 --
 -- TOC entry 300 (class 1255 OID 18653)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: mpolyfromtext(text, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4790,7 +4771,7 @@
 
 --
 -- TOC entry 303 (class 1255 OID 18656)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: mpolyfromwkb(bytea); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4824,7 +4805,7 @@
 
 --
 -- TOC entry 304 (class 1255 OID 18657)
--- Dependencies: 1102 1102 6
+-- Dependencies: 1102 6 1102
 -- Name: multi(geometry); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4910,7 +4891,7 @@
 
 --
 -- TOC entry 309 (class 1255 OID 18662)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: multipointfromtext(text, integer); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4923,7 +4904,7 @@
 
 --
 -- TOC entry 312 (class 1255 OID 18665)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: multipointfromwkb(bytea); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4957,7 +4938,7 @@
 
 --
 -- TOC entry 314 (class 1255 OID 18667)
--- Dependencies: 1102 6
+-- Dependencies: 6 1102
 -- Name: multipolyfromwkb(bytea); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -4991,7 +4972,7 @@
 
 --
 -- TOC entry 316 (class 1255 OID 18669)
--- Dependencies: 6 1102
+-- Dependencies: 1102 6
 -- Name: multipolygonfromtext(text); Type: FUNCTION; Schema: public; Owner: postgres
 --
 
@@ -5121,7 +510