Commit 9b2d215b authored by santiaago's avatar santiaago
Browse files

remove unnecessary handlers. Colors are now handled via parameter theme #26

parent eecabb14
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ func main() {
	r := new(route.Router)

	r.HandleFunc("/checkerboard", checkerboard.Checkerboard)
	r.HandleFunc("/checkerboard/:colorId", checkerboard.Color)

	r.HandleFunc("/squares/?", squares.Random)
	r.HandleFunc("/squares/random/?", squares.Random)
+0 −39
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ import (
	"image/color"
	"log"
	"net/http"
	"strconv"

	"github.com/taironas/route"
	"github.com/taironas/tinygraphs/colors"
	"github.com/taironas/tinygraphs/draw"
	"github.com/taironas/tinygraphs/extract"
@@ -19,43 +17,6 @@ func init() {
	log.SetFlags(log.Lshortfile)
}

// Color is the handler for /checkerboard/:colorId
// build a 6x6 checkerboard with alternate colors based on the number passed in the url
func Color(w http.ResponseWriter, r *http.Request) {

	var err error
	var id string
	if id, err = route.Context.Get(r, "colorId"); err != nil {
		log.Println("Unable to get 'key' value: ", err)
		id = "0"
	}

	var colorId int64
	if colorId, err = strconv.ParseInt(id, 0, 64); err != nil {
		colorId = 0
	}
	size := extract.Size(r)
	colorMap := colors.MapOfColorPatterns()
	var c1, c2 color.RGBA
	if val, ok := colorMap[int(colorId)]; ok {
		c1 = val[0]
		c2 = val[1]
	} else {
		c1 = colorMap[0][0]
		c2 = colorMap[0][1]
	}

	if f := extract.Format(r); f == format.JPEG {
		m := image.NewRGBA(image.Rect(0, 0, size, size))
		draw.Grid6X6(m, c1, c2)
		var img image.Image = m
		write.ImageJPEG(w, &img)
	} else if f == format.SVG {
		write.ImageSVG(w)
		draw.Grid6X6SVG(w, c1, c2, size)
	}
}

// Checkerboard is the handler for /checkerboard
// build a 6x6 checkerboard with alternate black and white colors.
func Checkerboard(w http.ResponseWriter, r *http.Request) {