Skip to content

Commit 227c40c

Browse files
miurahrmiurahr
committed
Prepare for 0.1 release
- fix several bugs - works tirex example map. - region data interface - japan region data. - world data.
1 parent 8ef637a commit 227c40c

11 files changed

+206
-89
lines changed

‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ all: ;
99

1010
install: all
1111
$(INSTALL) -d $(DESTDIR)/$(LUA_LIB_DIR)/osm
12+
$(INSTALL) -d $(DESTDIR)/$(LUA_LIB_DIR)/osm/data
1213
$(INSTALL) osm/*.lua $(DESTDIR)/$(LUA_LIB_DIR)/osm
14+
$(INSTALL) osm/data/*.lua $(DESTDIR)/$(LUA_LIB_DIR)/osm/data
1315

‎README.md

+34-48
Original file line numberDiff line numberDiff line change
@@ -18,90 +18,78 @@ http://wiki.nginx.org/HttpLuaModule
1818
This Lua library takes advantage of ngx_lua's cosocket API, which ensures
1919
100% nonblocking behavior.
2020

21-
Note that at least [ngx_lua 0.8.1](https://github.com/chaoslawful/lua-nginx-module/tags) or [ngx_openresty 1.2.1.14](http://openresty.org/#Download) is required.
21+
Note that at least [ngx_lua 0.8.1](https://github.com/chaoslawful/lua-nginx-module/tags) is required.
2222

2323
Synopsis
2424
========
2525

26-
lua_package_path "/path/to/lua-nginx-osm/lib/?.lua;;";
26+
lua_package_path "/path/to/lua-nginx-osm/?.lua;;";
27+
lua_shared_dict osm_tirex 10m; ## mandatory to use osm.tirex module
28+
lua_socket_log_errors off;
2729

2830
server {
2931
location /example {
3032
content_by_lua '
31-
local osm_tirex = require "osm.tirex"
32-
local osm_tile = require "osm.tile"
33+
local tirex = require "osm.tirex"
34+
local tile = require "osm.tile"
35+
local data = require "osm.data"
3336
3437
-- --------------------------------------------------
3538
-- check uri
3639
-- --------------------------------------------------
3740
local uri = ngx.var.uri
38-
local x, y, z = osm_tile.get_cordination(uri, "example", ".png")
41+
local map = 'example'
42+
local x, y, z = tile.get_cordination(uri, map, ".png")
3943
if not x then
4044
return ngx.exit(ngx.HTTP_FORBIDDEN)
4145
end
4246
4347
-- check x, y, z range
4448
local max_zoom = 18
4549
local min_zoom = 5
46-
if not osm_tile.check_integrity_xyzm(x, y, z, minz, maxz) then
50+
if not tile.check_integrity_xyzm(x, y, z, minz, maxz) then
4751
return ngx.exit(ngx.HTTP_FORBIDDEN)
4852
end
4953
5054
-- check x, y, z supported to generate
51-
local region = "japan"
55+
local region = data.get_region('japan')
5256
if not osm_tile.region_include(region, x, y, z)
5357
return ngx.exit(ngx.HTTP_FORBIDDEN)
5458
end
5559
56-
-- --------------------------------------------------
57-
-- generate tile and send back it
58-
-- --------------------------------------------------
59-
local tirex = osm_tirex:new()
60-
tirex:set_timeout(1000) -- 1 sec
61-
local ok, err = tirex:connect("unix:/var/run/tirex/master.sock")
62-
if not ok then
63-
ngx.say("failed to connect: ", err)
64-
return
65-
end
66-
local map = "example"
67-
local priority = 8
68-
local id, err = tirex:enqueue (map, x, y, z, priority)
69-
if not id then
70-
ngx.say("failed to request tile generation: ", err)
71-
return
72-
end
73-
74-
local res, err = tirex:result(id)
75-
if not res then
76-
ngx.say("failed to get result: ", err)
77-
return
78-
end
79-
80-
if res == ngx.null then
81-
ngx.say("rendering failed.")
82-
return
60+
-- try renderd file.
61+
local png, err = tile.get_tile(map, x, y, z)
62+
if png then
63+
ngx.header.content_type = 'image/png'
64+
ngx.print(png)
65+
return ngx.OK
8366
end
84-
85-
ok, err = tirex:close()
67+
68+
-- ask tirex to render it
69+
local ok = tirex.send_request(map, x, y, z)
8670
if not ok then
87-
ngx.say("failed to close: ", err)
88-
return
71+
return ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
8972
end
90-
91-
local meta = tile.xyz_to_metatile_filename(x, y, z)
92-
ok, err = tile.send_tile(meta, x, y)
93-
if not ok then
94-
ngx.say("failed to send tile:", err)
73+
74+
-- get tile image from metatile
75+
local tilefile = tile.xyz_to_metatile_filename(x, y, z)
76+
local tilepath = tirex_tilepath..'/'..map..'/'..tilefile
77+
local png, err = osm_tile.get_tile(tilepath, x, y, z)
78+
if png then
79+
ngx.header.content_type = 'image/png'
80+
ngx.print(png)
81+
return ngx.OK
9582
end
83+
ngx.log(ngx.ERR, err)
84+
return ngx.exit(ngx.HTTP_NOT_FOUND)
9685
';
9786
}
9887
}
9988

10089
Methods
10190
=======
10291

103-
All of the Tirex commands have their own methods with the same name except all in lower case.
104-
92+
only send_request() is supported.
10593

10694
TODO
10795
====
@@ -136,14 +124,12 @@ Hiroshi Miura <[email protected]>, OpenStreetMap Foundation Japan
136124
Copyright and License
137125
=====================
138126

139-
Hiroshi Miura, 2013
127+
Hiroshi Miura, 2013
140128

141129
Distributed under GPLv3
142130

143131
See Also
144132
========
145133
* the ngx_lua module: http://wiki.nginx.org/HttpLuaModule
146-
* the [lua-resty-memcached](https://github.com/agentzh/lua-resty-memcached) library
147-
* the [lua-resty-mysql](https://github.com/agentzh/lua-resty-mysql) library
148134

149135

‎debian/dh-lua.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CLIB_OBJS=
77
VERSION_INFO=
88

99
LUA_HEADER=
10-
LUA_SOURCES=$(wildcard osm/*.lua)
10+
LUA_SOURCES=$(wildcard osm/*.lua) $(wildcard osm/data/*.lua)
1111
LUA_SOURCES_MANGLER=
1212
LUA_MODNAME=osm
1313
LUA_TEST=

‎debian/lua-nginx-osm.docs

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
README.md
2+
doc/nginx-example.conf

‎doc/nginx-example.conf

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
http {
2+
3+
[...]
4+
5+
lua_package_path "/path/to/lua-nginx-osm/?.lua;;";
6+
lua_shared_dict osm_tirex 10m; # mandatory to use osm.tirex module
7+
lua_socket_log_errors off;
8+
9+
server {
10+
listen 80;
11+
server_name tileserver;
12+
root /var/www;
13+
14+
location / {
15+
access_by_lua '
16+
local osm_tile = require 'osm.tile'
17+
local minz = 0
18+
local maxz = 18
19+
local x, y, z = osm_tile.get_cordination(ngx.var.uri, "", "png")
20+
local ok = osm_tile.check_integrity_xyzm(x, y, z, minz, maxz)
21+
if not ok then
22+
ngx.exit(ngx.HTTP_FORBIDDEN)
23+
end
24+
';
25+
26+
content_by_lua '
27+
local osm_tile = require "osm.tile"
28+
local tirex = require "osm.tirex"
29+
local tirex_tilepath = "/var/lib/tirex/tiles/"
30+
local map = "example"
31+
local x, y, z = osm_tile.get_cordination(ngx.var.uri, "", "png")
32+
33+
-- try renderd file.
34+
local png, err = osm_tile.get_tile(map, x, y, z)
35+
if png then
36+
ngx.header.content_type = "image/png"
37+
ngx.print(png)
38+
return ngx.OK
39+
end
40+
41+
-- ask tirex to render it
42+
local ok = tirex.send_request(map, x, y, z)
43+
if not ok then
44+
return ngx.exit(ngx.HTTP_INTERNAL_SERVER_ERROR)
45+
end
46+
47+
local tilefile = osm_tile.xyz_to_metatile_filename(x, y, z)
48+
local tilepath = tirex_tilepath.."/"..map.."/"..tilefile
49+
local png, err = osm_tile.get_tile(tilepath, x, y, z)
50+
if png then
51+
ngx.header.content_type = "image/png"
52+
ngx.print(png)
53+
return ngx.OK
54+
end
55+
return ngx.exit(ngx.HTTP_NOT_FOUND)
56+
';
57+
}
58+
}
59+
}

‎ngx/lua.conf

-2
This file was deleted.

‎osm/data.lua

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
--
2+
-- OpenStreetMap region data library
3+
--
4+
--
5+
-- Copyright (C) 2013, Hiroshi Miura
6+
--
7+
-- This program is free software: you can redistribute it and/or modify
8+
-- it under the terms of the GNU General Public License as published by
9+
-- the Free Software Foundation, either version 3 of the License, or
10+
-- any later version.
11+
--
12+
-- This program is distributed in the hope that it will be useful,
13+
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
-- GNU Affero General Public License for more details.
16+
--
17+
-- You should have received a copy of the GNU Affero General Public License
18+
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
--
20+
local setmetatable = setmetatable
21+
local error = error
22+
local require = require
23+
local myname = ...
24+
25+
module(...)
26+
27+
_VERSION = '0.10'
28+
29+
local target = {
30+
['japan'] = myname .. '.japan',
31+
['world'] = myname .. '.world'
32+
}
33+
34+
function get_region(name)
35+
if not target[name] then
36+
return nil
37+
end
38+
local region = require(target[name])
39+
return region
40+
end
41+
42+
local class_mt = {
43+
-- to prevent use of casual module global variables
44+
__newindex = function (table, key, val)
45+
error('attempt to write to undeclared variable "' .. key .. '"')
46+
end
47+
}
48+
49+
setmetatable(_M, class_mt)

‎osm/data/japan.lua

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
local japan = {
2+
{
3+
{lon=153.890100, lat=26.382110},
4+
{lon=135.307900, lat=37.547400},
5+
{lon=140.576900, lat=45.706480},
6+
{lon=149.189100, lat=45.802450},
7+
{lon=153.890100, lat=26.382110}
8+
},
9+
{
10+
{lon=132.152900, lat=26.468090},
11+
{lon=131.691500, lat=21.209920},
12+
{lon=122.595400, lat=23.519660},
13+
{lon=122.560700, lat=25.841460},
14+
{lon=128.814500, lat=34.748350},
15+
{lon=129.396600, lat=35.094030},
16+
{lon=132.152900, lat=26.468090}
17+
},
18+
{
19+
{lon=153.890100, lat=26.382110},
20+
{lon=132.152900, lat=26.468090},
21+
{lon=129.396600, lat=35.094030},
22+
{lon=135.307900, lat=37.547400},
23+
{lon=153.890100, lat=26.382110}
24+
}
25+
}
26+
27+
return japan

‎osm/data/world.lua

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
local world = {
2+
{
3+
{lon=-180, lat=-89.9},
4+
{lon=-180, lat=89.9},
5+
{lon=180, lat=89.9},
6+
{lon=180, lat=-89.9},
7+
{lon=-180, lat=-89.9}
8+
}
9+
}
10+
11+
return world

‎osm/tile.lua

+7-7
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function deg2num(lon, lat, zoom)
6060
local lon_deg = tonumber(lon)
6161
local lat_rad = rad(lat)
6262
local xtile = floor(n * ((lon_deg + 180) / 360))
63-
local ytile = floor(n * (1 - (log(tan(lat_rad) + (1 / cos(lat_rad))) / math.pi)) / 2)
63+
local ytile = floor(n * (1 - (log(tan(lat_rad) + (1 / cos(lat_rad))) / pi)) / 2)
6464
return xtile, ytile
6565
end
6666

@@ -146,22 +146,22 @@ function get_tile(metafilename, x, y)
146146
return nil, err
147147
end
148148
local metatile_header_size = 532 -- XXX: 20 + 8 * 64
149-
local header, err = io_read(fd, metatile_header_size)
149+
local header, err = fd:read(metatile_header_size)
150150
if header == nil then
151-
io_close(fd)
151+
fd:close()
152152
return nil, err
153153
end
154154
-- offset: lookup table in header
155155
local pib = 20 + ((y % 8) * 8) + ((x % 8) * 8 * 8 )
156156
local offset = get_offset(header, pib)
157157
local size = get_offset(header, pib+4)
158-
io_seek(fd, "set", offset)
159-
local png, err = io_read(fd, size)
158+
fd:seek("set", offset)
159+
local png, err = fd:read(size)
160160
if png == nil then
161-
io_close(fd)
161+
fd:close()
162162
return nil, err
163163
end
164-
io_close(fd)
164+
fd:close()
165165
return png, nil
166166
end
167167

0 commit comments

Comments
 (0)